X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=vcs%2Fgitconfig.in;h=7476a829397b259d6a28f8c15674c63ec66b1a01;hb=7adece76ae1a6452248f2d2d26d1d5f21b0f38f6;hp=aa0ef858a5ff1855519f32dc57331145051914b4;hpb=37ad33e52daae7678ec23622af39da0c4998cfde;p=config%2Fdotfiles.git

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index aa0ef85..7476a82 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
@@ -242,6 +247,12 @@
 	# Don't create .git/hooks with any sample hooks. Reduces the clutter
 	# in new git repositories.
 	templateDir =
+	# Keep the default branch name
+	defaultBranch = master
+
+[tag]
+	# Sort tags as version numbers
+	sort = version:refname
 
 
 # NON-GIT SETTINGS
@@ -249,5 +260,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