# Use pager for the following commands.
[pager]
status = yes
- clean = yes
+ tag = yes
[alias]
# Shortcuts for often used commands.
c = commit -v
ci = commit -v
- d = diff
- di = diff
- dc = diff --cached
+ d = diff --patience
+ di = diff --patience
+ dc = diff --patience --cached
s = status
st = status
l = log
ls = log --stat
- lp = log -p
+ lp = log -p --patience
glog = log --pretty=oneline --graph --all
a = add
ap = add -p
+ au = add -u
co = checkout
b = branch -av
br = branch -av
ru = remote update
fs = fsck --strict --full
ss = stash save
+ ssk = stash save --keep-index
sa = stash apply
sl = stash list
+ fp = format-patch
[diff]
# Detect copies and renames.
renames = copy
-# Allow diffing of PDF files. `pdftotext-` is a wrapper around pdftotext which
-# writes to stdout.
+# 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`.
+[diff "gzip"]
+ textconv = gzip -d -c
[diff "pdf"]
textconv = pdftotext-
+[diff "sqlite"]
+ textconv = sqlite3dump
[merge]
IF(OS, darwin)