X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=846f013e56a8832e3e7d2d787c0ddf5850f4faa6;hb=cd16f7b634107cfee3150314986040558690fa46;hp=00045f4951e2c0a9620e908643a1de0c51c07085;hpb=b179b88b9659eda769a4aaec76f9b270ee41c000;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index 00045f4..846f013 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.
@@ -188,15 +189,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).
@@ -226,4 +226,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