X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=62e26f1ab01f2b98a122b187f97148cb17a52fb6;hb=7ab9b4ebb9785ff63501f4a5c335821636535b21;hp=448000a3c431d301284206599c39b2ab2727c050;hpb=95ec5924a6c2597f1b1a15aa9d6afcfe18bee222;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index 448000a..62e26f1 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,17 @@
 	a   = add
 	ap  = add --patch
 	au  = add --update
+	rs  = reset
+	rsh = reset --hard
+	rsp = reset --patch
 	## Branches.
 	co  = checkout
 	b   = branch -a -v
 	m   = merge
 	mo  = merge origin/master
+	re  = rebase
+	rei = rebase --interactive
+	rec = rebase --continue
 	## Remote.
 	f   = fetch
 	t   = tag
@@ -109,8 +122,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 +163,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.
@@ -160,7 +173,7 @@
 	# changes to non-word characters are shown character wise (e.g. from
 	# "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
 	# addition. See t/ for some tests and examples.
-	wordregex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
+	wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
 
 # Allow diffing of some binary files.
 #
@@ -174,6 +187,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