<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<oembed><type>rich</type><version>1.0</version><provider_name>phorkie</provider_name><provider_url>https://p.cweiske.de/</provider_url><title>git aliases</title><author_name>Christian Weiske</author_name><cache_age>86400</cache_age><width>900</width><height>900</height><html>&lt;!-- embedding all files of https://p.cweiske.de/57 --&gt;
&lt;link rel="stylesheet" href="https://p.cweiske.de/css/embed.css"/&gt;
&lt;div class="phork" id="57"&gt;
    &lt;div class="phork-file"&gt;
 &lt;div class="phork-content"&gt;
  &lt;style type="text/css"&gt;/**
 * GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2014 Benny Baumann
 * (http://qbnz.com/highlighter/ and http://geshi.org/)
 */
.ini .de1, .ini .de2 {font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;}
.ini  {font-family:monospace;}
.ini .imp {font-weight: bold; color: red;}
.ini li, .ini .li1 {color: #DDD;}
.ini .ln {width:1px;text-align:right;margin:0;padding:0 2px;vertical-align:top;}
.ini .co0 {color: #666666; font-style: italic;}
.ini .sy0 {color: #000066; font-weight:bold;}
.ini .st0 {color: #933;}
.ini .re0 {color: #000066; font-weight:bold;}
.ini .re1 {color: #000099;}
.ini .re2 {color: #660066;}
.ini span.xtra { display:block; }
&lt;/style&gt;&lt;div class="code"&gt;&lt;table class="ini"&gt;&lt;tbody&gt;&lt;tr class="li1"&gt;&lt;td class="ln"&gt;&lt;pre class="de1"&gt;1
2
3
4
5
6
7
8
9
10
11
12
&lt;/pre&gt;&lt;/td&gt;&lt;td class="de1"&gt;&lt;pre class="de1"&gt;alias.addnw&lt;span class="sy0"&gt;=&lt;/span&gt;&lt;span class="sy0"&gt;&lt;span class="re2"&gt;!sh -c 'git diff -w --no-color $@ | git apply --cached --ignore-whitespace' -&lt;/span&gt;&lt;/span&gt;
alias.br&lt;span class="sy0"&gt;=&lt;/span&gt;&lt;span class="re2"&gt;branch&lt;/span&gt;
alias.cdiff&lt;span class="sy0"&gt;=&lt;/span&gt;&lt;span class="re2"&gt;diff --cached&lt;/span&gt;
alias.co&lt;span class="sy0"&gt;=&lt;/span&gt;&lt;span class="re2"&gt;checkout&lt;/span&gt;
alias.hooksetup&lt;span class="sy0"&gt;=&lt;/span&gt;&lt;span class="re2"&gt;!cd &lt;/span&gt;&lt;span class="st0"&gt;&amp;quot;`git rev-parse --git-dir`/hooks&amp;quot;&lt;/span&gt; &amp;amp;&amp;amp; ln -fs /usr/local/src/git-client-hooks/hooks/commit-msg &amp;amp;&amp;amp; ln -fs /usr/local/src/git-client-hooks/hooks/pre-commit; cd -
alias.pp&lt;span class="sy0"&gt;=&lt;/span&gt;&lt;span class="re2"&gt;!git pull &amp;amp;&amp;amp; git push&lt;/span&gt;
alias.rmlock&lt;span class="sy0"&gt;=&lt;/span&gt;&lt;span class="re2"&gt;!rm `git rev-parse --git-dir`/index.lock&lt;/span&gt;
alias.rr&lt;span class="sy0"&gt;=&lt;/span&gt;&lt;span class="re2"&gt;!git reset --hard @&lt;span class="br0"&gt;&amp;#123;&lt;/span&gt;u&lt;span class="br0"&gt;&amp;#125;&lt;/span&gt;&lt;/span&gt;
alias.sl2&lt;span class="sy0"&gt;=&lt;/span&gt;&lt;span class="re2"&gt;log --decorate=short --abbrev-commit --graph --pretty=oneline&lt;/span&gt;
alias.sl&lt;span class="sy0"&gt;=&lt;/span&gt;&lt;span class="re2"&gt;log --graph --pretty=format:'%Cred%h%Creset%C&lt;span class="br0"&gt;&amp;#40;&lt;/span&gt;yellow&lt;span class="br0"&gt;&amp;#41;&lt;/span&gt;%d%Creset %s %Cgreen&lt;span class="br0"&gt;&amp;#40;&lt;/span&gt;%cr&lt;span class="br0"&gt;&amp;#41;&lt;/span&gt; %C&lt;span class="br0"&gt;&amp;#40;&lt;/span&gt;bold blue&lt;span class="br0"&gt;&amp;#41;&lt;/span&gt;&amp;lt;%an&amp;gt;%Creset' --abbrev-commit&lt;/span&gt;
alias.st&lt;span class="sy0"&gt;=&lt;/span&gt;&lt;span class="re2"&gt;status&lt;/span&gt;
&amp;#160;&lt;/pre&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;/div&gt;
 &lt;div class="phork-meta"&gt;
  &lt;a href="https://p.cweiske.de/57/rev-raw/5e24467eb5466ee2a3211ae08513515afa041bd4/git.ini" style="float: right"&gt;view raw source&lt;/a&gt;
  &lt;a href="https://p.cweiske.de/57#git.ini"&gt;git.ini&lt;/a&gt;
 &lt;/div&gt;
&lt;/div&gt;
    &lt;div class="phork-file"&gt;
 &lt;div class="phork-content"&gt;
  &lt;style type="text/css"&gt;/**
 * GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2014 Benny Baumann
 * (http://qbnz.com/highlighter/ and http://geshi.org/)
 */
.bash .de1, .bash .de2 {font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;}
.bash  {font-family:monospace;}
.bash .imp {font-weight: bold; color: red;}
.bash li, .bash .li1 {color: #DDD;}
.bash .ln {width:1px;text-align:right;margin:0;padding:0 2px;vertical-align:top;}
.bash .kw1 {color: #000000; font-weight: bold;}
.bash .kw2 {color: #c20cb9; font-weight: bold;}
.bash .kw3 {color: #7a0874; font-weight: bold;}
.bash .co0 {color: #666666; font-style: italic;}
.bash .co1 {color: #800000;}
.bash .co2 {color: #cc0000; font-style: italic;}
.bash .co3 {color: #000000; font-weight: bold;}
.bash .co4 {color: #666666;}
.bash .es1 {color: #000099; font-weight: bold;}
.bash .es2 {color: #007800;}
.bash .es3 {color: #007800;}
.bash .es4 {color: #007800;}
.bash .es5 {color: #780078;}
.bash .es_h {color: #000099; font-weight: bold;}
.bash .br0 {color: #7a0874; font-weight: bold;}
.bash .sy0 {color: #000000; font-weight: bold;}
.bash .st0 {color: #ff0000;}
.bash .st_h {color: #ff0000;}
.bash .nu0 {color: #000000;}
.bash .re0 {color: #007800;}
.bash .re1 {color: #007800;}
.bash .re2 {color: #007800;}
.bash .re4 {color: #007800;}
.bash .re5 {color: #660033;}
.bash span.xtra { display:block; }
&lt;/style&gt;&lt;div class="code"&gt;&lt;table class="bash"&gt;&lt;tbody&gt;&lt;tr class="li1"&gt;&lt;td class="ln"&gt;&lt;pre class="de1"&gt;1
&lt;/pre&gt;&lt;/td&gt;&lt;td class="de1"&gt;&lt;pre class="de1"&gt;&lt;span class="kw2"&gt;git config&lt;/span&gt; &lt;span class="re5"&gt;--global&lt;/span&gt; alias.rr &lt;span class="st_h"&gt;'!git reset --hard @{u}'&lt;/span&gt;&lt;/pre&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/tbody&gt;&lt;/table&gt;&lt;/div&gt;
 &lt;/div&gt;
 &lt;div class="phork-meta"&gt;
  &lt;a href="https://p.cweiske.de/57/rev-raw/5e24467eb5466ee2a3211ae08513515afa041bd4/setup.sh" style="float: right"&gt;view raw source&lt;/a&gt;
  &lt;a href="https://p.cweiske.de/57#setup.sh"&gt;setup.sh&lt;/a&gt;
 &lt;/div&gt;
&lt;/div&gt;
    &lt;div class="phork-file"&gt;
 &lt;div class="phork-content"&gt;
  
&lt;div class="document"&gt;


&lt;p&gt;Improve &amp;quot;git diff&amp;quot; context display: &lt;a class="reference external" href="https://drunkenmonkey.at/blog/diffs_with_proper_function_context"&gt;https://drunkenmonkey.at/blog/diffs_with_proper_function_context&lt;/a&gt;&lt;/p&gt;
&lt;/div&gt;

 &lt;/div&gt;
 &lt;div class="phork-meta"&gt;
  &lt;a href="https://p.cweiske.de/57/rev-raw/5e24467eb5466ee2a3211ae08513515afa041bd4/z-links.rst" style="float: right"&gt;view raw source&lt;/a&gt;
  &lt;a href="https://p.cweiske.de/57#z-links.rst"&gt;z-links.rst&lt;/a&gt;
 &lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
</html></oembed>
