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
+ dw = diff --color-words
+ dc = diff --cached
+ dcw = diff --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
+ lpw = log --patch --color-words
a = add
ap = add --patch
au = add --update
ss = stash save
ssk = stash save --keep-index
ssu = stash save --include-untracked
- sa = stash apply
- sp = stash pop
+ sa = stash apply --index
+ sp = stash pop --index
## Custom commands.
#
# Detect copies and renames.
renames = copy
+ # Diff algorithm to use.
+ algorithm = patience
+
# Change the definition of a word as used by diff --color-words to be
# shorter (not only spaces) and thus simplify the generated diffs.
# Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
# changes to non-word characters are shown character wise (e.g. from
# "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
# addition. See t/ for some tests and examples.
- wordregex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
+ wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
# Allow diffing of some binary files.
#
[diff "sqlite"]
textconv = sh -c 'exec sqlite3 "$@" .dump' -
+[log]
+ # Display branches/tag names in log (same as log's --decorate option).
+ decorate = short
+
[merge]
tool = vimdiff