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

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index ced4fe14c129b8a63e3cddf41021a878dc350d3d..7d8d6c4466b683e812feb87a77dbc4a91df5151c 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -56,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.
@@ -96,7 +96,7 @@ 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) for the idea.
+       # (2011-06-04 16:06 CEST) for the idea.
        rp = ! git remote | xargs -L1 -I{} git push {}
 
 [diff]