gitconfig: disable annex.sshcaching

[config/dotfiles.git] / gitconfig.in

diff --git a/gitconfig.in b/gitconfig.in
index b498cc96452c2692cd53abeb262d2084b9c32acd..0b50312b21bb1ed54bfa6a597d5a2a35746b4619 100644 (file)
--- 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
@@ -195,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
@@ -218,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