X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=f30716150a830e0dc03e16ea6431ebd7194d3b2d;hb=697f21858a757dce843c15dea734b6fe0d984be2;hp=91e1f3d3e265d164b04e14bba6b64c74f72509b1;hpb=128626bb9ec22e101a34a7c0f2e93f4e137a6e2b;p=config%2Fdotfiles.git diff --git a/gitconfig.m4 b/gitconfig.m4 index 91e1f3d..f307161 100644 --- a/gitconfig.m4 +++ b/gitconfig.m4 @@ -26,6 +26,20 @@ include(../lib.m4) [color] ui = auto +[color "diff"] + # Meta information. + meta = yellow bold + # Hunk header. + frag = magenta bold + # Function in hunk header. + function = magenta bold + # Removed lines. + old = red bold + # Added lines. + new = green bold + # Commit headers. + commit = cyan + [core] editor = vim # Can't use ~/ because of older git versions. @@ -57,8 +71,8 @@ include(../lib.m4) au = add --update # Branches. co = checkout - b = branch --all --verbose - br = branch --all --verbose + b = branch -a -v + br = branch -a -v m = merge me = merge # Remote. @@ -70,8 +84,10 @@ include(../lib.m4) ru = remote update # Patches. fp = format-patch + # Maintenance. (Redirection of stderr is necessary to prevent missing + # output with my "color stderr" solution in Zsh.) + fs = ! git fsck --strict --full 2>&1 # Misc. - fs = fsck --strict --full sl = stash list ss = stash save sa = stash apply @@ -81,6 +97,9 @@ include(../lib.m4) # # tig-like log view. glog = log --pretty=oneline --graph --all + # Push to all remotes. Thanks to albel727 in #git on Freenode + # (2011-06-04 16:06 CEST) for the idea. + rp = ! git remote | xargs -L1 -I{} git push {} [diff] # Detect copies and renames. @@ -109,4 +128,4 @@ FI # replies to the first one. thread = shallow -# vim: ft=gitconfig +# vim: ft=gitconfig noet