[color]
ui = auto
+[color "diff"]
+ # Meta information.
+ meta = yellow bold
+ # Hunk header.
+ frag = magenta bold
+ # Function in hunk header.
+ function = magenta bold
+ # Removed lines.
+ old = red bold
+ # Added lines.
+ new = green bold
+ # Commit headers.
+ commit = cyan
+
[core]
editor = vim
# Can't use ~/ because of older git versions.
tag = yes
[alias]
- # Shortcuts for often used commands.
- c = commit -v
- ci = commit -v
- d = diff --patience
- di = diff --patience
- dc = diff --patience --cached
- s = status
- st = status
- l = log
- ls = log --stat
- 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
- m = merge
- me = merge
- f = fetch
- fe = fetch
- t = tag
- p = push
- pu = push
- ru = remote update
- fs = fsck --strict --full
- ss = stash save
+ ## Shortcuts for often used commands.
+ #
+ ## 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
+ 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 -a -v
+ br = branch -a -v
+ m = merge
+ me = merge
+ mo = merge origin/master
+ ## Remote.
+ f = fetch
+ fe = fetch
+ t = tag
+ p = push
+ pu = 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
+ sa = stash apply
ssk = stash save --keep-index
- sa = stash apply
- sl = stash list
- fp = format-patch
+
+ ## Custom commands.
+ #
+ # tig-like log view.
+ glog = log --pretty=oneline --graph --all
[diff]
# Detect copies and renames.
# replies to the first one.
thread = shallow
-# vim: ft=gitconfig
+[receive]
+ # Automatically fsck objects when receiving them (respected by git
+ # receive-pack and git fetch (>= 1.7.8, for fetch)).
+ fsckobjects = true
+
+# vim: ft=gitconfig noet