gitconfig: enable merge.defaultToUpstream

[config/dotfiles.git] / gitconfig.in

diff --git a/gitconfig.in b/gitconfig.in
index a04b7574ab23ed255839f6f7f56f7b9b050613d2..0f2d4d0fcc11df4ed849626668cd2d770035f929 100644 (file)
--- 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,22 @@
 
 # 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.