- # Local.
- c = commit --verbose
- ci = commit --verbose
- d = diff --patience
- di = diff --patience
- dc = diff --patience --cached
- s = status
- st = status
- l = log
- ls = log --stat
- lp = log --patch --patience
- a = add
- ap = add --patch
- au = add --update
- # Branches.
- co = checkout
- b = branch --all --verbose
- br = branch --all --verbose
- m = merge
- me = merge
- # Remote.
- f = fetch
- fe = fetch
- t = tag
- p = push
- pu = push
- ru = remote update
- # Patches.
- fp = format-patch
- # Misc.
- fs = fsck --strict --full
- ss = stash save
+ ## Local.
+ 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
+ ds = diff --stat
+ s = 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
+ m = merge
+ mo = merge origin/master
+ ## Remote.
+ f = fetch
+ t = tag
+ p = push
+ # Parallel git remote update. Also strips unnecessary output.
+ ru = "! git remote \
+ | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
+ | sed '/^$/d; \
+ /^Please make sure you have the correct access rights$/d; \
+ /^and the repository exists\\.$/d;'"
+ # Push to all remotes. Thanks to albel727 in #git on Freenode
+ # (2011-06-04 16:06 CEST) for the idea. Modified to push in parallel
+ # and to strip unnecessary output.
+ rp = "! git remote \
+ | xargs -d '\\n' -n1 -P0 git push 2>&1 \
+ | sed '/^$/d; \
+ /^Please make sure you have the correct access rights$/d; \
+ /^and the repository exists\\.$/d;'"
+ ## 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.
+ sl = stash list
+ ss = stash save