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

diff --git a/gitconfig.m4 b/gitconfig.m4
index e7461fb..5e08291 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -26,6 +26,20 @@ include(../lib.m4)
 [color]
 	ui = auto
 
+[color "diff"]
+	# Meta information.
+	meta = yellow bold
+	# Hunk header.
+	frag = magenta bold
+	# Function in hunk header.
+	function = magenta bold
+	# Removed lines.
+	old = red bold
+	# Added lines.
+	new = green bold
+	# Commit headers.
+	commit = cyan
+
 [core]
 	editor = vim
 	# Can't use ~/ because of older git versions.
@@ -40,47 +54,54 @@ include(../lib.m4)
 	# Shortcuts for often used commands.
 	#
 	# 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
-	s  = status
-	st = status
-	l  = log
-	ls = log --stat
-	lp = log --patch --patience
-	a  = add
-	ap = add --patch
-	au = add --update
+	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
+	s   = status
+	st  = status
+	l   = log
+	ls  = log --stat
+	lp  = log --patch PATIENCE
+	a   = add
+	ap  = add --patch
+	au  = add --update
 	# Branches.
-	co = checkout
-	b  = branch --all --verbose
-	br = branch --all --verbose
-	m  = merge
-	me = merge
+	co  = checkout
+	b   = branch -a -v
+	br  = branch -a -v
+	m   = merge
+	me  = merge
+	mo  = merge origin/master
 	# Remote.
-	f  = fetch
-	fe = fetch
-	t  = tag
-	p  = push
-	pu = push
-	ru = remote update
+	f   = fetch
+	fe  = fetch
+	t   = tag
+	p   = push
+	pu  = push
+	ru  = remote update
 	# Patches.
-	fp = format-patch
+	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
-	ss = stash save
+	sl  = stash list
+	ss  = stash save
+	sa  = stash apply
 	ssk = stash save --keep-index
-	sa = stash apply
-	sl = stash list
 
 	# Custom commands.
 	#
 	# tig-like log view.
 	glog = log --pretty=oneline --graph --all
+	# Push to all remotes. Thanks to albel727 in #git on Freenode
+	# (2011-06-04 16:06 CEST) for the idea.
+	rp = ! git remote | xargs -L1 -I{} git push {}
 
 [diff]
 	# Detect copies and renames.
@@ -109,4 +130,4 @@ FI
 	# replies to the first one.
 	thread = shallow
 
-# vim: ft=gitconfig
+# vim: ft=gitconfig noet