vcs/gitconfig: always highlight whitespace errors

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

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index 93e98663f8994e4ad975d8f075a07c84ed364991..c8b2304537451412088d521366174a882cda5656 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
@@ -189,7 +193,7 @@
        wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
 
 # Rules to allow diffing of some binary files. Disabled by default to prevent
-# programs from running them on arbitrary files via a .local .gitattributes
+# repositories from running them on arbitrary files via a local .gitattributes
 # file. Copy them to .git/config of the repository to enable them.
 #
 # "sh -c '..' ARGV0" is used when the programs require additional arguments
@@ -242,6 +246,8 @@
        # Don't create .git/hooks with any sample hooks. Reduces the clutter
        # in new git repositories.
        templateDir =
+       # Keep the default branch name
+       defaultBranch = master
 
 
 # NON-GIT SETTINGS