# 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
c = commit --verbose
ca = commit --verbose --amend
cad = commit --verbose --amend --date=
- d = diff PATIENCE
- dw = diff PATIENCE --color-words
- dc = diff PATIENCE --cached
- dcw = diff PATIENCE --cached --color-words
+ d = diff --patience
+ dw = diff --patience --color-words
+ dc = diff --patience --cached
+ dcw = diff --patience --cached --color-words
ds = diff --stat
s = status
l = log
ls = log --stat
- lp = log --patch PATIENCE
- lpw = log --patch PATIENCE --color-words
+ lp = log --patch --patience
+ lpw = log --patch --patience --color-words
a = add
ap = add --patch
au = add --update
# 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.
[transfer]
# Automatically fsck objects when receiving them (respected by git
# receive-pack and git fetch (>= 1.7.8, for fetch)).
- fsckobjects = true
+ fsckobjects = yes
# vim: ft=gitconfig