1 # Global Git configuration file.
3 # Copyright (C) 2011-2017 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
73 dcw = diff --cached --color-words
74 dcs = diff --cached --stat
76 gi = grep --ignore-case
81 lpw = log --patch --color-words
96 mo = merge origin/master
98 rei = rebase --interactive
99 rec = rebase --continue
107 # Parallel git remote update. Also strips unnecessary output.
109 | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
111 /^Please make sure you have the correct access rights$/d; \
112 /^and the repository exists\\.$/d;'"
113 # Push to all remotes. Thanks to albel727 in #git on Freenode
114 # (2011-06-04 16:06 CEST) for the idea. Modified to push in parallel
115 # and to strip unnecessary output.
117 | xargs -d '\\n' -n1 -P0 git push 2>&1 \
119 /^Please make sure you have the correct access rights$/d; \
120 /^and the repository exists\\.$/d;'"
124 # (Redirection of stderr is necessary to prevent missing output with
125 # my "color stderr" solution in Zsh.)
126 fs = ! git fsck --strict --full 2>&1
127 fg = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo
131 ssk = stash save --keep-index
132 ssu = stash save --include-untracked
133 sa = stash apply --index
134 sp = stash pop --index
138 # tig-like log view. Similar to the following but with author/date
139 # information. --pretty=format is not used because it doesn't allow
140 # precise enough control over formats and colors.
142 # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
143 tig = ! PWD/bin/tig.pl
145 # Create backup of uncommitted and untracked changes.
146 ssb = "! git stash save --include-untracked \
147 \"Backup on $(LANG=C date '+%a, %d %b %Y %H:%M:%S %z')\" \
149 && git stash apply >/dev/null"
151 # Display list and content of untracked files. Untracked directories
152 # and symbolic links are only listed.
153 u = "! git ls-files --other --exclude-standard --directory -z \
156 printf \"\\033[1;33m-> %s\\033[0m:\" \"$x\"; \
157 if test -d \"$x\"; then \
158 echo \" directory\"; \
159 elif test -h \"$x\"; then \
160 echo \" symbolic link\"; \
170 # Detect copies and renames.
173 # Diff algorithm to use.
174 algorithm = histogram
176 # Highlight moved code in a different color.
179 # Replace "a/" and "b/" prefix in diffs with characters describing the
180 # context (e.g. "i/"ndex and "w/"ork tree).
181 mnemonicprefix = true
183 # Change the definition of a word as used by diff --color-words to be
184 # shorter (not only spaces) and thus simplify the generated diffs.
185 # Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
186 # ([^a-zA-Z0-9_]), therefore changes to words are shown in complete
187 # (e.g. from "word" to "newword" as "[-word-]{+newword+}"), but
188 # changes to non-word characters are shown character wise (e.g. from
189 # "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
190 # addition. See t/ for some tests and examples.
191 wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
193 # Allow diffing of some binary files.
195 # "sh -c '..' ARGV0" is used when the programs require additional arguments
196 # which are passed after ARGV0 by git.
198 textconv = gzip -d -c
200 textconv = sh -c 'exec pdftotext "$@" -' ARGV0
202 textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0
205 # Display branches/tag names in log (same as log's --decorate option).
207 # If a single file is given to `git log`, automatically use --follow.
213 # Merge upstream branch if `git merge` is called without arguments.
214 defaultToUpstream = yes
217 # When running git push without a refspec push only the current
218 # branch, see man page git-config(1) for details. Default since Git
223 # When using git format-patch use threads and add all patches as
224 # replies to the first one.
228 # Automatically fsck objects when receiving them (respected by git
229 # receive-pack and git fetch (>= 1.7.8, for fetch)).
236 # My SSH config already uses ControlMaster where appropriate.