X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=9fd76ba7af18af483ad9134f5d91665e96c91999;hb=0364d08152c0e6613d6fb3580a22f7d042c84439;hp=b498cc96452c2692cd53abeb262d2084b9c32acd;hpb=d53d2c400c779eeabd9bc3afd89b1069d6b2127b;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index b498cc9..9fd76ba 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -1,6 +1,6 @@
 # Global Git configuration file.
 
-# Copyright (C) 2011-2015  Simon Ruderich
+# Copyright (C) 2011-2017  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -79,6 +79,7 @@
 	ls  = log --stat
 	lp  = log --patch
 	lpw = log --patch --color-words
+	ld  = show --date=short -s --pretty='format:%h (\"%s\", %ad)' # describe
 	a   = add
 	ap  = add --patch
 	au  = add --update
@@ -97,6 +98,9 @@
 	re  = rebase
 	rei = rebase --interactive
 	rec = rebase --continue
+	cp  = cherry-pick
+	## Submodules.
+	sm  = submodule
 	## Remote.
 	f   = fetch
 	t   = tag
@@ -170,6 +174,13 @@
 	# Diff algorithm to use.
 	algorithm = histogram
 
+	# Highlight moved code in a different color.
+	colorMoved = zebra
+
+	# Replace "a/" and "b/" prefix in diffs with characters describing the
+	# context (e.g. "i/"ndex and "w/"ork tree).
+	mnemonicprefix = true
+
 	# Change the definition of a word as used by diff --color-words to be
 	# shorter (not only spaces) and thus simplify the generated diffs.
 	# Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
@@ -182,19 +193,20 @@
 
 # Allow diffing of some binary files.
 #
-# "sh -c '..' -" is used when the programs require additional arguments. The
-# last "-" is argv[0] which is passed to sh, the real arguments are passed
-# after "-" by git.
+# "sh -c '..' ARGV0" is used when the programs require additional arguments
+# which are passed after ARGV0 by git.
 [diff "gzip"]
 	textconv = gzip -d -c
 [diff "pdf"]
-	textconv = sh -c 'exec pdftotext "$@" -' -
+	textconv = sh -c 'exec pdftotext "$@" -' ARGV0
 [diff "sqlite"]
-	textconv = sh -c 'exec sqlite3 "$@" .dump' -
+	textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0
 
 [log]
 	# Display branches/tag names in log (same as log's --decorate option).
 	decorate = short
+	# If a single file is given to `git log`, automatically use --follow.
+	follow = yes
 
 [merge]
 	tool = vimdiff
@@ -218,4 +230,11 @@
 	# receive-pack and git fetch (>= 1.7.8, for fetch)).
 	fsckObjects = yes
 
+
+# NON-GIT SETTINGS
+
+[annex]
+	# My SSH config already uses ControlMaster where appropriate.
+	sshcaching = false
+
 # vim: ft=gitconfig