X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=53dd50c671636edfca307d1dfddf87a65250c307;hb=03ab1c6670d209c416eecb35625173b527f019bb;hp=a701c250b2953f50c4c38e73800776ab843351d4;hpb=818a192058faa7b69d1ec8d8b80bba3a7f57865d;p=config%2Fdotfiles.git diff --git a/gitconfig.in b/gitconfig.in index a701c25..53dd50c 100644 --- a/gitconfig.in +++ b/gitconfig.in @@ -73,6 +73,7 @@ dcw = diff --cached --color-words dcs = diff --cached --stat g = grep + gi = grep --ignore-case s = status l = log ls = log --stat @@ -84,12 +85,13 @@ rs = reset rsh = reset --hard rsp = reset --patch - # Only clean ignored files. + rv = revert cl = clean -ndx clf = clean -fdx ## Branches. co = checkout b = branch -a -v + br = branch m = merge mo = merge origin/master re = rebase @@ -193,6 +195,8 @@ [log] # Display branches/tag names in log (same as log's --decorate option). decorate = short + # If a single file is given to `git log`, automatically use --follow. + follow = yes [merge] tool = vimdiff @@ -202,7 +206,8 @@ [push] # When running git push without a refspec push only the current - # branch, see man page git-config(1) for details. + # branch, see man page git-config(1) for details. Default since Git + # 2.0. default = simple [format] @@ -213,6 +218,6 @@ [transfer] # Automatically fsck objects when receiving them (respected by git # receive-pack and git fetch (>= 1.7.8, for fetch)). - fsckobjects = yes + fsckObjects = yes # vim: ft=gitconfig