vcs/gitconfig: add more git-annex options

[config/dotfiles.git] / vcs / gitconfig.in

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index ce370a50f45fc3fc70457f34b26365c769d39d26..eb9c61d2047a2139d572aead836b7807cb2c05b2 100644 (file)
--- a/vcs/gitconfig.in
+++ b/vcs/gitconfig.in
@@ -174,6 +174,10 @@
        # Highlight moved code in a different color.
        colorMoved = zebra
 
+       # Highlight whitespace errors (at the end of the line) in all lines of
+       # a diff; the default shows them only in new lines
+       wsErrorHighlight = old,new,context
+
        # Replace "a/" and "b/" prefix in diffs with characters describing the
        # context (e.g. "i/"ndex and "w/"ork tree).
        mnemonicprefix = true
@@ -251,5 +255,12 @@
 [annex]
        # My SSH config already uses ControlMaster where appropriate.
        sshcaching = false
+       # Don't upgrade repositories automatically
+       autoupgraderepository = false
+       # Force `git add` to add to git, never to annex
+       gitaddtoannex = false
+       # Consider dotfiles to be `git annex add`able; restrictions of
+       # annex.largefiles (if set) are still applied
+       dotfiles = true
 
 # vim: ft=gitconfig