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

diff --git a/gitconfig.in b/gitconfig.in
index 53dd50c..0b50312 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -97,6 +97,8 @@
 	re  = rebase
 	rei = rebase --interactive
 	rec = rebase --continue
+	## Submodules.
+	sm  = submodule
 	## Remote.
 	f   = fetch
 	t   = tag
@@ -170,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
@@ -220,4 +226,11 @@
 	# receive-pack and git fetch (>= 1.7.8, for fetch)).
 	fsckObjects = yes
 
+
+# NON-GIT SETTINGS
+
+[annex]
+	# My SSH config already uses ControlMaster where appropriate.
+	sshcaching = false
+
 # vim: ft=gitconfig