Merge remote-tracking branch 'asp/master'

diff --git a/gitconfig.m4 b/gitconfig.m4
index 7d8d6c4466b683e812feb87a77dbc4a91df5151c..e865454ee72ba7ee5526fc34fd1b53f9610af522 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -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
@@ -126,4 +129,4 @@ FI
        # replies to the first one.
        thread = shallow
 
-# vim: ft=gitconfig
+# vim: ft=gitconfig noet