X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vcs%2Fgitconfig.in;h=e7d0893515a1c0b8f08967bdb8827994f15c988c;hb=e5f0ee9f7010477adac5b4379537e38a65949a13;hp=ce370a50f45fc3fc70457f34b26365c769d39d26;hpb=c6d4ddd552ee8c9ecda52e806bfe5d706baf307c;p=config%2Fdotfiles.git

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index ce370a5..e7d0893 100644
--- a/vcs/gitconfig.in
+++ b/vcs/gitconfig.in
@@ -76,7 +76,7 @@
 	ls  = log --stat
 	lp  = log --patch
 	lpw = log --patch --color-words
-	ld  = show --date=short --no-patch --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
@@ -102,6 +102,7 @@
 	f   = fetch
 	t   = tag
 	p   = push
+	pf  = push --force-with-lease
 	# Parallel git remote update. Also strips unnecessary output.
 	ru = "! git remote \
 	      | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
@@ -174,6 +175,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 +256,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