X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=d1f7f60cf51fa84e35fc2fc20d43a7a13b4f3e1b;hb=7c6bd583d9d0a4dce07f212da963244b94e3a708;hp=d52b16a658491bae729bc9fe0d1133362e25b427;hpb=5963f2f7d075d45e21b5b4cfd203cab3263fd8d7;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index d52b16a..d1f7f60 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,11 @@
 	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
 	ls  = log --stat
@@ -74,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
@@ -109,8 +126,8 @@
 	ss  = stash save
 	ssk = stash save --keep-index
 	ssu = stash save --include-untracked
-	sa  = stash apply
-	sp  = stash pop
+	sa  = stash apply --index
+	sp  = stash pop --index
 
 	## Custom commands.
 	#
@@ -150,7 +167,7 @@
 	renames = copy
 
 	# Diff algorithm to use.
-	algorithm = patience
+	algorithm = histogram
 
 	# Change the definition of a word as used by diff --color-words to be
 	# shorter (not only spaces) and thus simplify the generated diffs.
@@ -174,6 +191,10 @@
 [diff "sqlite"]
 	textconv = sh -c 'exec sqlite3 "$@" .dump' -
 
+[log]
+	# Display branches/tag names in log (same as log's --decorate option).
+	decorate = short
+
 [merge]
 	tool = vimdiff