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

diff --git a/gitconfig.m4 b/gitconfig.m4
index 9748a00..7d8d6c4 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.
@@ -38,37 +52,52 @@ include(../lib.m4)
 
 [alias]
 	# Shortcuts for often used commands.
-	c  = commit --verbose
-	ci = commit --verbose
-	d  = diff --patience
-	di = diff --patience
-	dc = diff --patience --cached
-	s  = status
-	st = status
-	l  = log
-	ls = log --stat
-	lp = log --patch --patience
-	glog = log --pretty=oneline --graph --all
-	a  = add
-	ap = add --patch
-	au = add --update
-	co = checkout
-	b  = branch --all --verbose
-	br = branch --all --verbose
-	m  = merge
-	me = merge
-	f  = fetch
-	fe = fetch
-	t  = tag
-	p  = push
-	pu = push
-	ru = remote update
-	fs = fsck --strict --full
-	ss = stash save
+	#
+	# 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
+	# Branches.
+	co  = checkout
+	b   = branch -a -v
+	br  = branch -a -v
+	m   = merge
+	me  = merge
+	# Remote.
+	f   = fetch
+	fe  = fetch
+	t   = tag
+	p   = push
+	pu  = push
+	ru  = remote update
+	# Patches.
+	fp  = format-patch
+	# Misc.
+	fs  = fsck --strict --full
+	sl  = stash list
+	ss  = stash save
+	sa  = stash apply
 	ssk = stash save --keep-index
-	sa = stash apply
-	sl = stash list
-	fp = format-patch
+
+	# 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.