X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=5e082916128fabf8f1d563e16feb7a457c0586b9;hb=71b25d26dab3781599026c678bccc0c61c68c265;hp=7d8d6c4466b683e812feb87a77dbc4a91df5151c;hpb=2eef5463417d581034bfbacb016114d0a5be3434;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index 7d8d6c4..5e08291 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -75,6 +75,7 @@ include(../lib.m4)
 	br  = branch -a -v
 	m   = merge
 	me  = merge
+	mo  = merge origin/master
 	# Remote.
 	f   = fetch
 	fe  = fetch
@@ -84,8 +85,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 +130,4 @@ FI
 	# replies to the first one.
 	thread = shallow
 
-# vim: ft=gitconfig
+# vim: ft=gitconfig noet