X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=7d8d6c4466b683e812feb87a77dbc4a91df5151c;hb=2eef5463417d581034bfbacb016114d0a5be3434;hp=91e1f3d3e265d164b04e14bba6b64c74f72509b1;hpb=128626bb9ec22e101a34a7c0f2e93f4e137a6e2b;p=config%2Fdotfiles.git diff --git a/gitconfig.m4 b/gitconfig.m4 index 91e1f3d..7d8d6c4 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. @@ -42,23 +56,23 @@ include(../lib.m4) # Local. c = commit --verbose ci = commit --verbose - d = diff --patience - di = diff --patience - dw = diff --patience --color-words - dc = diff --patience --cached - dcw = diff --patience --cached --color-words + d = diff PATIENCE + di = diff PATIENCE + dw = diff PATIENCE --color-words + dc = diff PATIENCE --cached + dcw = diff PATIENCE --cached --color-words s = status st = status l = log ls = log --stat - lp = log --patch --patience + lp = log --patch PATIENCE a = add ap = add --patch 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. @@ -81,6 +95,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.