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

diff --git a/gitconfig.m4 b/gitconfig.m4
index b6c59d5..5e08291 100644
--- 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
@@ -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