X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vcs%2Fgitconfig.in;h=eb9c61d2047a2139d572aead836b7807cb2c05b2;hb=6d98916f74cf9ee437dbe2d1711a172d5549dadc;hp=aa0ef858a5ff1855519f32dc57331145051914b4;hpb=37ad33e52daae7678ec23622af39da0c4998cfde;p=config%2Fdotfiles.git

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index aa0ef85..eb9c61d 100644
--- 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
@@ -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
@@ -249,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