# 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
# 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