Merge remote-tracking branch 'asp/master'

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index b6c59d5ad677d825e4122d94e1e482da511f5004..e865454ee72ba7ee5526fc34fd1b53f9610af522 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -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,8 +84,11 @@ 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
+       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