X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=b498cc96452c2692cd53abeb262d2084b9c32acd;hb=d53d2c400c779eeabd9bc3afd89b1069d6b2127b;hp=43819d60fc35c62b78748857fa811c877d44b663;hpb=d6504ced04347a3e4e364bad751491634deec68f;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index 43819d6..b498cc9 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -29,7 +29,7 @@
 	# Hunk header.
 	frag = magenta bold
 	# Function in hunk header.
-	func = magenta bold
+	func = blue bold
 	# Removed lines.
 	old = red bold
 	# Added lines.
@@ -37,6 +37,11 @@
 	# Commit headers.
 	commit = cyan
 
+# GNU grep-like colors.
+[color "grep"]
+	filename = magenta
+	linenumber = green
+
 [core]
 	editor = vim
 	# Global gitattributes file. Thanks to canton7 in #git on Freenode
@@ -63,10 +68,12 @@
 	cad = commit --verbose --amend --date=
 	d   = diff
 	dw  = diff --color-words
+	ds  = diff --stat
 	dc  = diff --cached
 	dcw = diff --cached --color-words
-	ds  = diff --stat
+	dcs = diff --cached --stat
 	g   = grep
+	gi  = grep --ignore-case
 	s   = status
 	l   = log
 	ls  = log --stat
@@ -75,11 +82,21 @@
 	a   = add
 	ap  = add --patch
 	au  = add --update
+	rs  = reset
+	rsh = reset --hard
+	rsp = reset --patch
+	rv  = revert
+	cl  = clean -ndx
+	clf = clean -fdx
 	## Branches.
 	co  = checkout
 	b   = branch -a -v
+	br  = branch
 	m   = merge
 	mo  = merge origin/master
+	re  = rebase
+	rei = rebase --interactive
+	rec = rebase --continue
 	## Remote.
 	f   = fetch
 	t   = tag
@@ -187,7 +204,8 @@
 
 [push]
 	# When running git push without a refspec push only the current
-	# branch, see man page git-config(1) for details.
+	# branch, see man page git-config(1) for details. Default since Git
+	# 2.0.
 	default = simple
 
 [format]
@@ -198,6 +216,6 @@
 [transfer]
 	# Automatically fsck objects when receiving them (respected by git
 	# receive-pack and git fetch (>= 1.7.8, for fetch)).
-	fsckobjects = yes
+	fsckObjects = yes
 
 # vim: ft=gitconfig