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.
41 # 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
52 # 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
82 ld = show --date=short -s --pretty='format:%h (\"%s\", %ad)' # describe
97 mo = merge origin/master
99 rei = rebase --interactive
100 rec = rebase --continue
108 # Parallel git remote update. Also strips unnecessary output.
110 | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
112 /^Please make sure you have the correct access rights$/d; \
113 /^and the repository exists\\.$/d;'"
114 # Push to all remotes. Thanks to albel727 in #git on Freenode
115 # (2011-06-04 16:06 CEST) for the idea. Modified to push in parallel
116 # and to strip unnecessary output.
118 | xargs -d '\\n' -n1 -P0 git push 2>&1 \
120 /^Please make sure you have the correct access rights$/d; \
121 /^and the repository exists\\.$/d;'"
125 # (Redirection of stderr is necessary to prevent missing output with
126 # my "color stderr" solution in Zsh.)
127 fs = ! git fsck --strict --full 2>&1
128 fg = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo
132 ssk = stash save --keep-index
133 ssu = stash save --include-untracked
134 sa = stash apply --index
135 sp = stash pop --index
139 # tig-like log view. Similar to the following but with author/date
140 # information. --pretty=format is not used because it doesn't allow
141 # precise enough control over formats and colors.
143 # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
144 tig = ! PWD/bin/tig.pl
146 # Create backup of uncommitted and untracked changes.
147 ssb = "! git stash save --include-untracked \
148 \"Backup on $(LANG=C date '+%a, %d %b %Y %H:%M:%S %z')\" \
150 && git stash apply >/dev/null"
152 # Display list and content of untracked files. Untracked directories
153 # and symbolic links are only listed.
154 u = "! git ls-files --other --exclude-standard --directory -z \
157 printf \"\\033[1;33m-> %s\\033[0m:\" \"$x\"; \
158 if test -d \"$x\"; then \
159 echo \" directory\"; \
160 elif test -h \"$x\"; then \
161 echo \" symbolic link\"; \
171 # Detect copies and renames.
174 # Diff algorithm to use.
175 algorithm = histogram
177 # Highlight moved code in a different color.
180 # Replace "a/" and "b/" prefix in diffs with characters describing the
181 # context (e.g. "i/"ndex and "w/"ork tree).
182 mnemonicprefix = true
184 # Change the definition of a word as used by diff --color-words to be
185 # shorter (not only spaces) and thus simplify the generated diffs.
186 # Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
187 # ([^a-zA-Z0-9_]), therefore changes to words are shown in complete
188 # (e.g. from "word" to "newword" as "[-word-]{+newword+}"), but
189 # changes to non-word characters are shown character wise (e.g. from
190 # "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
191 # addition. See t/ for some tests and examples.
192 wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
194 # Allow diffing of some binary files.
196 # "sh -c '..' ARGV0" is used when the programs require additional arguments
197 # which are passed after ARGV0 by git.
199 textconv = gzip -d -c
201 textconv = sh -c 'exec pdftotext "$@" -' ARGV0
203 textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0
206 # Display branches/tag names in log (same as log's --decorate option).
208 # If a single file is given to `git log`, automatically use --follow.
214 # Merge upstream branch if `git merge` is called without arguments.
215 defaultToUpstream = true
218 # Use single-letter command names in git rebase -i which are faster to
220 abbreviateCommands = true
223 # When running git push without a refspec push only the current
224 # branch, see man page git-config(1) for details. Default since Git
229 # When using git format-patch use threads and add all patches as
230 # replies to the first one.
234 # Automatically fsck objects when receiving them (respected by git
235 # receive-pack and git fetch (>= 1.7.8, for fetch)).
239 # Disable annoying advice messages.
240 waitingForEditor = false
246 # My SSH config already uses ControlMaster where appropriate.