Merge remote-tracking branch 'asp/master'

diff --combined gitconfig.m4
index 32bb9cff67608e4c6a8b415a4dffab3100199b1e,7d8d6c4466b683e812feb87a77dbc4a91df5151c..e865454ee72ba7ee5526fc34fd1b53f9610af522
--- 1/gitconfig.m4
--- 2/gitconfig.m4
+++ b/gitconfig.m4
@@@ -56,16 -56,16 +56,16 @@@ 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
@@@ -84,11 -84,8 +84,11 @@@
        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
 +      fg  = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo
        # Misc.
 -      fs  = fsck --strict --full
        sl  = stash list
        ss  = stash save
        sa  = stash apply
@@@ -129,4 -126,4 +129,4 @@@ F
        # replies to the first one.
        thread = shallow
  
 -# vim: ft=gitconfig
 +# vim: ft=gitconfig noet