X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=b8fd3b666f1c9164f00d8e339c0db8b7b401359a;hb=f7850f026716087201c0621d6f33271c8b9d66b0;hp=22b61d17ecf6f58a244a77f14c2b804f71668e27;hpb=46ec6b7571d3ddd642e532d7bd04855d0fadc7c0;p=config%2Fdotfiles.git diff --git a/gitconfig.m4 b/gitconfig.m4 index 22b61d1..b8fd3b6 100644 --- a/gitconfig.m4 +++ b/gitconfig.m4 @@ -26,8 +26,8 @@ include(../lib.m4) l = log a = add co = checkout - b = branch - br = branch + b = branch -av + br = branch -av m = merge me = merge f = fetch @@ -41,6 +41,10 @@ include(../lib.m4) sa = stash apply sl = stash list +[diff] + # Detect copies and renames. + renames = copy + [merge] IF(OS, darwin) tool = opendiff