X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=7e0bea8feee48c6b4982b0003868bdcb69dd1a69;hb=dcf12c51b985d9c36d5283a6e8e5ad324db968a1;hp=0b50312b21bb1ed54bfa6a597d5a2a35746b4619;hpb=ec66748118be9e076d2f2db14140ec217d6e0347;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index 0b50312..7e0bea8 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
@@ -97,6 +97,7 @@
 	re  = rebase
 	rei = rebase --interactive
 	rec = rebase --continue
+	cp  = cherry-pick
 	## Submodules.
 	sm  = submodule
 	## Remote.
@@ -172,6 +173,9 @@
 	# 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
@@ -188,15 +192,14 @@
 
 # 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).