setup.sh,gitconfig: Support old Git without diff --patience.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 171f256626745f352cdcdc6c732b2e76f4d0e95c..7d8d6c4466b683e812feb87a77dbc4a91df5151c 100644 (file)
--- 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.
@@ -38,37 +52,52 @@ include(../lib.m4)
 
 [alias]
        # Shortcuts for often used commands.
-       c  = commit -v
-       ci = commit -v
-       d  = diff --patience
-       di = diff --patience
-       dc = diff --patience --cached
-       s  = status
-       st = status
-       l  = log
-       ls = log --stat
-       lp = log -p --patience
-       glog = log --pretty=oneline --graph --all
-       a  = add
-       ap = add -p
-       au = add -u
-       co = checkout
-       b  = branch -av
-       br = branch -av
-       m  = merge
-       me = merge
-       f  = fetch
-       fe = fetch
-       t  = tag
-       p  = push
-       pu = push
-       ru = remote update
-       fs = fsck --strict --full
-       ss = stash save
+       #
+       # 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
+       s   = status
+       st  = status
+       l   = log
+       ls  = log --stat
+       lp  = log --patch PATIENCE
+       a   = add
+       ap  = add --patch
+       au  = add --update
+       # Branches.
+       co  = checkout
+       b   = branch -a -v
+       br  = branch -a -v
+       m   = merge
+       me  = merge
+       # Remote.
+       f   = fetch
+       fe  = fetch
+       t   = tag
+       p   = push
+       pu  = push
+       ru  = remote update
+       # Patches.
+       fp  = format-patch
+       # Misc.
+       fs  = fsck --strict --full
+       sl  = stash list
+       ss  = stash save
+       sa  = stash apply
        ssk = stash save --keep-index
-       sa = stash apply
-       sl = stash list
-       fp = format-patch
+
+       # Custom commands.
+       #
+       # 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.