1 # Global Git configuration file.
3 # Copyright (C) 2011-2013 Simon Ruderich
5 # This file is free software: you can redistribute it and/or modify
6 # it under the terms of the GNU General Public License as published by
7 # the Free Software Foundation, either version 3 of the License, or
8 # (at your option) any later version.
10 # This file is distributed in the hope that it will be useful,
11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 # GNU General Public License for more details.
15 # You should have received a copy of the GNU General Public License
16 # along with this file. If not, see <http://www.gnu.org/licenses/>.
24 email = simon@ruderich.org
34 # Function in hunk header.
35 function = magenta bold
45 # Global gitattributes file. Thanks to canton7 in #git on Freenode
46 # (2011-11-09 13:23 CET).
47 attributesfile = PWD/gitattributes
49 # Use pager for the following commands.
55 # Don't require <Return> in interactive commands which require only a
56 # single key, for example `git add --patch`. Requires Perl module
61 ## Shortcuts for often used commands.
66 ca = commit --verbose --amend
67 cad = commit --verbose --amend --date=
70 dw = diff PATIENCE --color-words
71 dc = diff PATIENCE --cached
72 dcw = diff PATIENCE --cached --color-words
77 lp = log --patch PATIENCE
78 lpw = log --patch PATIENCE --color-words
88 mo = merge origin/master
95 # Parallel git remote update. Also strips unnecessary output.
97 | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
99 /^Please make sure you have the correct access rights$/d; \
100 /^and the repository exists\\.$/d;'"
101 # Push to all remotes. Thanks to albel727 in #git on Freenode
102 # (2011-06-04 16:06 CEST) for the idea. Modified to push in parallel
103 # and to strip unnecessary output.
105 | xargs -d '\\n' -n1 -P0 git push 2>&1 \
107 /^Please make sure you have the correct access rights$/d; \
108 /^and the repository exists\\.$/d;'"
112 # (Redirection of stderr is necessary to prevent missing output with
113 # my "color stderr" solution in Zsh.)
114 fs = ! git fsck --strict --full 2>&1
115 fg = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo
119 ssk = stash save --keep-index
125 # tig-like log view. Similar to the following but with author/date
126 # information. --pretty=format is not used because it doesn't allow
127 # precise enough control over formats and colors.
129 # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
130 tig = ! PWD/bin/tig.pl
132 # Create backup of uncommitted and untracked changes.
133 ssb = "! git stash save --include-untracked \
134 \"Backup on $(date -R)\" >/dev/null \
135 && git stash apply >/dev/null"
137 # Display list and content of untracked files. Untracked directories
138 # and symbolic links are only listed.
139 u = "! git ls-files --other --exclude-standard --directory -z \
142 printf \"\\033[1;33m-> %s\\033[0m:\" \"$x\"; \
143 if test -d \"$x\"; then \
144 echo \" directory\"; \
145 elif test -h \"$x\"; then \
146 echo \" symbolic link\"; \
156 # Detect copies and renames.
159 # Change the definition of a word as used by diff --color-words to be
160 # shorter (not only spaces) and thus simplify the generated diffs.
161 # Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
162 # ([^a-zA-Z0-9_]), therefore changes to words are shown in complete
163 # (e.g. from "word" to "newword" as "[-word-]{+newword+}"), but
164 # changes to non-word characters are shown character wise (e.g. from
165 # "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
166 # addition. See t/ for some tests and examples.
167 wordregex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
169 # Allow diffing of some binary files.
171 # `pdftotext-` is a wrapper around pdftotext which writes to stdout.
172 # `sqlite3dump` is a wrapper calling `sqlite3 database-file .dump`.
174 textconv = gzip -d -c
176 textconv = PWD/bin/pdftotext-
178 textconv = PWD/bin/sqlite3dump
189 # When using git format-patch use threads and add all patches as
190 # replies to the first one.
194 # Automatically fsck objects when receiving them (respected by git
195 # receive-pack and git fetch (>= 1.7.8, for fetch)).