[core]
editor = vim
+ # Global gitattributes file. Thanks to canton7 in #git on Freenode
+ # (2011-11-09 13:23 CET).
+ attributesfile = PWD/gitattributes
# Use pager for the following commands.
[pager]
[interactive]
# Don't require <Return> in interactive commands which require only a
- # single key, for example `git add --patch`.
+ # single key, for example `git add --patch`. Requires Perl module
+ # Term::Readkey.
singlekey = yes
[alias]
#
## Local.
c = commit --verbose
- ci = commit --verbose
+ ca = commit --verbose --amend
+ cad = commit --verbose --amend --date=
d = diff PATIENCE
- di = diff PATIENCE
dw = diff PATIENCE --color-words
dc = diff PATIENCE --cached
dcw = diff PATIENCE --cached --color-words
+ ds = diff --stat
s = status
- st = status
l = log
ls = log --stat
lp = log --patch PATIENCE
+ lpw = log --patch PATIENCE --color-words
a = add
ap = add --patch
au = add --update
## Branches.
co = checkout
b = branch -a -v
- br = branch -a -v
m = merge
- me = merge
mo = merge origin/master
## Remote.
f = fetch
- fe = fetch
t = tag
p = push
- pu = push
# Parallel git remote update. Also strips unnecessary output.
ru = "! git remote \
| xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
sl = stash list
ss = stash save
ssk = stash save --keep-index
+ ssu = stash save --include-untracked
sa = stash apply
sp = stash pop
# precise enough control over formats and colors.
#
# tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
- tig = ! TIG
+ tig = ! PWD/bin/tig.pl
# Create backup of uncommitted and untracked changes.
ssb = "! git stash save --include-untracked \
- \"Backup on $(date -R)\" >/dev/null \
+ \"Backup on $(LANG=C date '+%a, %d %b %Y %H:%M:%S %z')\" \
+ >/dev/null \
&& git stash apply >/dev/null"
# Display list and content of untracked files. Untracked directories
[diff "gzip"]
textconv = gzip -d -c
[diff "pdf"]
- textconv = pdftotext-
+ textconv = PWD/bin/pdftotext-
[diff "sqlite"]
- textconv = sqlite3dump
+ textconv = PWD/bin/sqlite3dump
[merge]
IF(OS, darwin)
# receive-pack and git fetch (>= 1.7.8, for fetch)).
fsckobjects = true
-# vim: ft=gitconfig noet
+# vim: ft=gitconfig