X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=0f2d4d0fcc11df4ed849626668cd2d770035f929;hb=91be5d6a9ab86f14eed55a4fc0f6b8928900c21c;hp=cf6e169c737b2f5ae126e1f9c0713ce041179849;hpb=8dc6cf2910e7888e8eb737786c5b588c3c280b27;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index cf6e169..0f2d4d0 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -1,6 +1,6 @@
 # Global Git configuration file.
 
-# Copyright (C) 2011-2013  Simon Ruderich
+# Copyright (C) 2011-2014  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
@@ -161,18 +161,27 @@
 
 # Allow diffing of some binary files.
 #
-# `pdftotext-` is a wrapper around pdftotext which writes to stdout.
-# `sqlite3dump` is a wrapper calling `sqlite3 database-file .dump`.
+# "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.
 [diff "gzip"]
 	textconv = gzip -d -c
 [diff "pdf"]
-	textconv = PWD/bin/pdftotext-
+	textconv = sh -c 'exec pdftotext "$@" -' -
 [diff "sqlite"]
-	textconv = PWD/bin/sqlite3dump
+	textconv = sh -c 'exec sqlite3 "$@" .dump' -
 
 [merge]
 	tool = vimdiff
 
+	# Merge upstream branch if `git merge` is called without arguments.
+	defaultToUpstream = yes
+
+[push]
+	# When running git push without a refspec push only the current
+	# branch, see man page git-config(1) for details.
+	default = simple
+
 [format]
 	# When using git format-patch use threads and add all patches as
 	# replies to the first one.