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