1 # Global Git configuration file.
3 # Copyright (C) 2011-2015 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/>.
21 email = simon@ruderich.org
31 # Function in hunk header.
40 # GNU grep-like colors.
47 # Global gitattributes file. Thanks to canton7 in #git on Freenode
48 # (2011-11-09 13:23 CET).
49 attributesfile = PWD/gitattributes
51 # Use pager for the following commands.
57 # Don't require <Return> in interactive commands which require only a
58 # single key, for example `git add --patch`. Requires Perl module
63 ## Shortcuts for often used commands.
67 ca = commit --verbose --amend
68 cad = commit --verbose --amend --date=
70 dw = diff --color-words
72 dcw = diff --cached --color-words
79 lpw = log --patch --color-words
87 mo = merge origin/master
92 # Parallel git remote update. Also strips unnecessary output.
94 | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
96 /^Please make sure you have the correct access rights$/d; \
97 /^and the repository exists\\.$/d;'"
98 # Push to all remotes. Thanks to albel727 in #git on Freenode
99 # (2011-06-04 16:06 CEST) for the idea. Modified to push in parallel
100 # and to strip unnecessary output.
102 | xargs -d '\\n' -n1 -P0 git push 2>&1 \
104 /^Please make sure you have the correct access rights$/d; \
105 /^and the repository exists\\.$/d;'"
109 # (Redirection of stderr is necessary to prevent missing output with
110 # my "color stderr" solution in Zsh.)
111 fs = ! git fsck --strict --full 2>&1
112 fg = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo
116 ssk = stash save --keep-index
117 ssu = stash save --include-untracked
118 sa = stash apply --index
119 sp = stash pop --index
123 # tig-like log view. Similar to the following but with author/date
124 # information. --pretty=format is not used because it doesn't allow
125 # precise enough control over formats and colors.
127 # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
128 tig = ! PWD/bin/tig.pl
130 # Create backup of uncommitted and untracked changes.
131 ssb = "! git stash save --include-untracked \
132 \"Backup on $(LANG=C date '+%a, %d %b %Y %H:%M:%S %z')\" \
134 && git stash apply >/dev/null"
136 # Display list and content of untracked files. Untracked directories
137 # and symbolic links are only listed.
138 u = "! git ls-files --other --exclude-standard --directory -z \
141 printf \"\\033[1;33m-> %s\\033[0m:\" \"$x\"; \
142 if test -d \"$x\"; then \
143 echo \" directory\"; \
144 elif test -h \"$x\"; then \
145 echo \" symbolic link\"; \
155 # Detect copies and renames.
158 # Diff algorithm to use.
159 algorithm = histogram
161 # Change the definition of a word as used by diff --color-words to be
162 # shorter (not only spaces) and thus simplify the generated diffs.
163 # Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
164 # ([^a-zA-Z0-9_]), therefore changes to words are shown in complete
165 # (e.g. from "word" to "newword" as "[-word-]{+newword+}"), but
166 # changes to non-word characters are shown character wise (e.g. from
167 # "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
168 # addition. See t/ for some tests and examples.
169 wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
171 # Allow diffing of some binary files.
173 # "sh -c '..' -" is used when the programs require additional arguments. The
174 # last "-" is argv[0] which is passed to sh, the real arguments are passed
177 textconv = gzip -d -c
179 textconv = sh -c 'exec pdftotext "$@" -' -
181 textconv = sh -c 'exec sqlite3 "$@" .dump' -
184 # Display branches/tag names in log (same as log's --decorate option).
190 # Merge upstream branch if `git merge` is called without arguments.
191 defaultToUpstream = yes
194 # When running git push without a refspec push only the current
195 # branch, see man page git-config(1) for details.
199 # When using git format-patch use threads and add all patches as
200 # replies to the first one.
204 # Automatically fsck objects when receiving them (respected by git
205 # receive-pack and git fetch (>= 1.7.8, for fetch)).