rs = reset
rsh = reset --hard
rsp = reset --patch
- # Only clean ignored files.
+ rv = revert
cl = clean -ndx
clf = clean -fdx
## Branches.
re = rebase
rei = rebase --interactive
rec = rebase --continue
+ ## Submodules.
+ sm = submodule
## Remote.
f = fetch
t = tag
# Diff algorithm to use.
algorithm = histogram
+ # Replace "a/" and "b/" prefix in diffs with characters describing the
+ # context (e.g. "i/"ndex and "w/"ork tree).
+ mnemonicprefix = true
+
# 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
[log]
# Display branches/tag names in log (same as log's --decorate option).
decorate = short
+ # If a single file is given to `git log`, automatically use --follow.
+ follow = yes
[merge]
tool = vimdiff