# Local.
c = commit --verbose
ci = commit --verbose
- d = diff --patience
- di = diff --patience
- dw = diff --patience --color-words
- dc = diff --patience --cached
- dcw = diff --patience --cached --color-words
+ d = diff PATIENCE
+ di = diff PATIENCE
+ dw = diff PATIENCE --color-words
+ dc = diff PATIENCE --cached
+ dcw = diff PATIENCE --cached --color-words
s = status
st = status
l = log
ls = log --stat
- lp = log --patch --patience
+ lp = log --patch PATIENCE
a = add
ap = add --patch
au = add --update
# Branches.
co = checkout
- b = branch --all --verbose
- br = branch --all --verbose
+ b = branch -a -v
+ br = branch -a -v
m = merge
me = merge
+ mo = merge origin/master
# Remote.
f = fetch
fe = fetch
ru = remote update
# Patches.
fp = format-patch
+ # Maintenance. (Redirection of stderr is necessary to prevent missing
+ # output with my "color stderr" solution in Zsh.)
+ fs = ! git fsck --strict --full 2>&1
+ fg = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo
# Misc.
- fs = fsck --strict --full
sl = stash list
ss = stash save
sa = stash apply
#
# tig-like log view.
glog = log --pretty=oneline --graph --all
+ # Push to all remotes. Thanks to albel727 in #git on Freenode
+ # (2011-06-04 16:06 CEST) for the idea.
+ rp = ! git remote | xargs -L1 -I{} git push {}
[diff]
# Detect copies and renames.
# replies to the first one.
thread = shallow
-# vim: ft=gitconfig
+# vim: ft=gitconfig noet