X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=vcs%2Fgitconfig.in;h=1c42cdfd28230dfa34aac67dd9f1ba97fed27ef0;hp=1394a4bb2c3614c20838c9f6f5df296cc39b4ce6;hb=d94ce439cce4ee12e391be2e082905347c628bf3;hpb=d5ab3d20a8ac183b9703a66d7164387fa598d268

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index 1394a4b..1c42cdf 100644
--- a/vcs/gitconfig.in
+++ b/vcs/gitconfig.in
@@ -62,7 +62,7 @@
 	## Local.
 	c   = commit --verbose
 	ca  = commit --verbose --amend
-	cad = commit --verbose --amend --date=
+	cad = commit --verbose --amend --date=now
 	d   = diff
 	dw  = diff --color-words
 	ds  = diff --stat
@@ -76,7 +76,7 @@
 	ls  = log --stat
 	lp  = log --patch
 	lpw = log --patch --color-words
-	ld  = show --date=short -s --pretty='format:%h (\"%s\", %ad)' # describe
+	ld  = show --no-patch --date=short --pretty='format:%h (%s, %ad)' # describe, same as --pretty=reference
 	a   = add
 	ap  = add --patch
 	au  = add --update
@@ -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
@@ -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