X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=11f725a0fcd8c0002f19e6d5c176e21316a4d44f;hb=f346dd2a6e436deac96312c5f87883c673bce348;hp=f54be46c38c9ea7714b6cf37f65df5d46eeec535;hpb=d5d7971c950917b711df9a0cd57269167713de68;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index f54be46..11f725a 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -1,6 +1,6 @@
 # Global Git configuration file.
 
-# Copyright (C) 2011-2014  Simon Ruderich
+# Copyright (C) 2011-2015  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
 	# Hunk header.
 	frag = magenta bold
 	# Function in hunk header.
-	function = 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,9 +68,10 @@
 	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
 	s   = status
 	l   = log
@@ -75,11 +81,21 @@
 	a   = add
 	ap  = add --patch
 	au  = add --update
+	rs  = reset
+	rsh = reset --hard
+	rsp = reset --patch
+	# Only clean ignored files.
+	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 +203,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 +215,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