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

diff --git a/gitconfig.in b/gitconfig.in
index d1f7f60..0b50312 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -73,6 +73,7 @@
 	dcw = diff --cached --color-words
 	dcs = diff --cached --stat
 	g   = grep
+	gi  = grep --ignore-case
 	s   = status
 	l   = log
 	ls  = log --stat
@@ -84,7 +85,7 @@
 	rs  = reset
 	rsh = reset --hard
 	rsp = reset --patch
-	# Only clean ignored files.
+	rv  = revert
 	cl  = clean -ndx
 	clf = clean -fdx
 	## Branches.
@@ -96,6 +97,8 @@
 	re  = rebase
 	rei = rebase --interactive
 	rec = rebase --continue
+	## Submodules.
+	sm  = submodule
 	## Remote.
 	f   = fetch
 	t   = tag
@@ -169,6 +172,10 @@
 	# Diff algorithm to use.
 	algorithm = histogram
 
+	# Replace "a/" and "b/" prefix in diffs with characters describing the
+	# context (e.g. "i/"ndex and "w/"ork tree).
+	mnemonicprefix = true
+
 	# Change the definition of a word as used by diff --color-words to be
 	# shorter (not only spaces) and thus simplify the generated diffs.
 	# Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
@@ -194,6 +201,8 @@
 [log]
 	# Display branches/tag names in log (same as log's --decorate option).
 	decorate = short
+	# If a single file is given to `git log`, automatically use --follow.
+	follow = yes
 
 [merge]
 	tool = vimdiff
@@ -203,7 +212,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]
@@ -214,6 +224,13 @@
 [transfer]
 	# Automatically fsck objects when receiving them (respected by git
 	# receive-pack and git fetch (>= 1.7.8, for fetch)).
-	fsckobjects = yes
+	fsckObjects = yes
+
+
+# NON-GIT SETTINGS
+
+[annex]
+	# My SSH config already uses ControlMaster where appropriate.
+	sshcaching = false
 
 # vim: ft=gitconfig