t = tag
p = push
pu = push
- ru = remote update
+ # 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.
- rp = ! git remote | xargs -L1 -I{} git push {}
+ # (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.
## Misc.
sl = stash list
ss = stash save
- sa = stash apply
ssk = stash save --keep-index
+ sa = stash apply
+ sp = stash pop
## Custom commands.
#
# tig-like log view.
- glog = log --pretty=oneline --graph --all
+ tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
[diff]
# Detect copies and renames.
renames = copy
+ # 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
+ # ([^a-zA-Z0-9_]), therefore changes to words are shown in complete
+ # (e.g. from "word" to "newword" as "[-word-]{+newword+}"), but
+ # 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_]
+
# Allow diffing of some binary files.
+#
# `pdftotext-` is a wrapper around pdftotext which writes to stdout.
# `sqlite3dump` is a wrapper calling `sqlite3 database-file .dump`.
[diff "gzip"]
# replies to the first one.
thread = shallow
+[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