1 # Global Git configuration file.
3 # Copyright (C) 2011-2018 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.
49 # Use pager for the following commands.
54 # Don't require <Return> in interactive commands which require only a
55 # single key, for example `git add --patch`. Requires Perl module
60 ## Shortcuts for often used commands.
64 ca = commit --verbose --amend
65 cad = commit --verbose --amend --date=now
67 dw = diff --color-words
70 dcw = diff --cached --color-words
71 dcs = diff --cached --stat
73 gi = grep --ignore-case
78 lpw = log --patch --color-words
79 ld = show --no-patch --date=short --pretty='format:%h (%s, %ad)' # describe, same as --pretty=reference
94 mo = merge origin/master
96 rei = rebase --interactive
97 rec = rebase --continue
105 # Parallel git remote update. Also strips unnecessary output.
107 | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
109 /^Please make sure you have the correct access rights$/d; \
110 /^and the repository exists\\.$/d;'"
111 # Push to all remotes. Thanks to albel727 in #git on Freenode
112 # (2011-06-04 16:06 CEST) for the idea. Modified to push in parallel
113 # and to strip unnecessary output.
115 | xargs -d '\\n' -n1 -P0 git push 2>&1 \
117 /^Please make sure you have the correct access rights$/d; \
118 /^and the repository exists\\.$/d;'"
122 # (Redirection of stderr is necessary to prevent missing output with
123 # my "color stderr" solution in Zsh.)
124 fs = ! git fsck --strict --full 2>&1
125 fg = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo
129 ssk = stash push --keep-index
130 ssu = stash push --include-untracked
131 sa = stash apply --index
132 sp = stash pop --index
136 # tig-like log view. Similar to the following but with author/date
137 # information. --pretty=format is not used because it doesn't allow
138 # precise enough control over formats and colors.
140 # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
141 tig = ! PWD/bin/tig.pl
143 # Create backup of uncommitted and untracked changes.
144 ssb = "! git stash push --include-untracked \
145 -m \"Backup on $(LANG=C date '+%a, %d %b %Y %H:%M:%S %z')\" \
147 && git stash apply >/dev/null"
149 # Display list and content of untracked files. Untracked directories
150 # and symbolic links are only listed.
151 u = "! git ls-files --other --exclude-standard --directory -z \
154 printf \"\\033[1;33m-> %s\\033[0m:\" \"$x\"; \
155 if test -d \"$x\"; then \
156 echo \" directory\"; \
157 elif test -h \"$x\"; then \
158 echo \" symbolic link\"; \
168 # Detect copies and renames.
171 # Diff algorithm to use.
172 algorithm = histogram
174 # Highlight moved code in a different color.
177 # Highlight whitespace errors (at the end of the line) in all lines of
178 # a diff; the default shows them only in new lines
179 wsErrorHighlight = old,new,context
181 # Replace "a/" and "b/" prefix in diffs with characters describing the
182 # context (e.g. "i/"ndex and "w/"ork tree).
183 mnemonicprefix = true
185 # Change the definition of a word as used by diff --color-words to be
186 # shorter (not only spaces) and thus simplify the generated diffs.
187 # Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
188 # ([^a-zA-Z0-9_]), therefore changes to words are shown in complete
189 # (e.g. from "word" to "newword" as "[-word-]{+newword+}"), but
190 # changes to non-word characters are shown character wise (e.g. from
191 # "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
192 # addition. See t/ for some tests and examples.
193 wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
195 # Rules to allow diffing of some binary files. Disabled by default to prevent
196 # repositories from running them on arbitrary files via a local .gitattributes
197 # file. Copy them to .git/config of the repository to enable them.
199 # "sh -c '..' ARGV0" is used when the programs require additional arguments
200 # which are passed after ARGV0 by git.
202 # textconv = gzip -d -c
204 # textconv = sh -c 'exec pdftotext "$@" -' ARGV0
206 # textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0
209 # Display branches/tag names in log (same as log's --decorate option).
211 # If a single file is given to `git log`, automatically use --follow.
217 # Merge upstream branch if `git merge` is called without arguments.
218 defaultToUpstream = true
221 # Use single-letter command names in git rebase -i which are faster to
223 abbreviateCommands = true
226 # When running git push without a refspec push only the current
227 # branch, see man page git-config(1) for details. Default since Git
232 # When using git format-patch use threads and add all patches as
233 # replies to the first one.
237 # Automatically fsck objects when receiving them (respected by git
238 # receive-pack and git fetch (>= 1.7.8, for fetch)).
242 # Disable annoying advice messages.
243 waitingForEditor = false
246 # Don't create .git/hooks with any sample hooks. Reduces the clutter
247 # in new git repositories.
249 # Keep the default branch name
250 defaultBranch = master
256 # My SSH config already uses ControlMaster where appropriate.
258 # Don't upgrade repositories automatically
259 autoupgraderepository = false
260 # Force `git add` to add to git, never to annex
261 gitaddtoannex = false
262 # Consider dotfiles to be `git annex add`able; restrictions of
263 # annex.largefiles (if set) are still applied