1 # Global Git configuration file.
3 # Copyright (C) 2011-2023 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
24 # Disable annoying advice messages.
25 waitingForEditor = false
28 ## Shortcuts for often used commands.
32 ca = commit --verbose --amend
33 cad = commit --verbose --amend --date=now
35 dw = diff --color-words
38 dcw = diff --cached --color-words
39 dcs = diff --cached --stat
41 gi = grep --ignore-case
46 lpw = log --patch --color-words
47 ld = show --no-patch --date=short --pretty='format:%h (%s, %ad)' # describe, same as --pretty=reference
62 mo = merge origin/master
64 rei = rebase --interactive
65 rec = rebase --continue
73 pf = push --force-with-lease
74 # Parallel git remote update. Also strips unnecessary output.
76 | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
78 /^Please make sure you have the correct access rights$/d; \
79 /^and the repository exists\\.$/d;'"
80 # Push to all remotes. Thanks to albel727 in #git on Freenode
81 # (2011-06-04 16:06 CEST) for the idea. Modified to push in parallel
82 # and to strip unnecessary output.
84 | xargs -d '\\n' -n1 -P0 git push 2>&1 \
86 /^Please make sure you have the correct access rights$/d; \
87 /^and the repository exists\\.$/d;'"
91 # (Redirection of stderr is necessary to prevent missing output with
92 # my "color stderr" solution in Zsh.)
93 fs = ! git fsck --strict --full 2>&1
94 fg = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo
98 ssk = stash push --keep-index
99 ssu = stash push --include-untracked
100 sa = stash apply --index
101 sp = stash pop --index
105 # tig-like log view. Similar to the following but with author/date
106 # information. --pretty=format is not used because it doesn't allow
107 # precise enough control over formats and colors.
109 # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
110 tig = ! PWD/bin/tig.pl
112 # Create backup of uncommitted and untracked changes.
113 ssb = "! git stash push --include-untracked \
114 -m \"Backup on $(LANG=C date '+%a, %d %b %Y %H:%M:%S %z')\" \
116 && git stash apply >/dev/null"
118 # Display list and content of untracked files. Untracked directories
119 # and symbolic links are only listed.
120 u = "! git ls-files --other --exclude-standard --directory -z \
123 printf \"\\033[1;33m-> %s\\033[0m:\" \"$x\"; \
124 if test -d \"$x\"; then \
125 echo \" directory\"; \
126 elif test -h \"$x\"; then \
127 echo \" symbolic link\"; \
144 # Function in hunk header.
154 # GNU grep-like colors.
162 # Detect copies and renames.
165 # Diff algorithm to use.
166 algorithm = histogram
168 # Highlight moved code in a different color.
171 # Highlight whitespace errors (at the end of the line) in all lines of
172 # a diff; the default shows them only in new lines
173 wsErrorHighlight = old,new,context
175 # Replace "a/" and "b/" prefix in diffs with characters describing the
176 # context (e.g. "i/"ndex and "w/"ork tree).
177 mnemonicprefix = true
179 # Change the definition of a word as used by diff --color-words to be
180 # shorter (not only spaces) and thus simplify the generated diffs.
181 # Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
182 # ([^a-zA-Z0-9_]), therefore changes to words are shown in complete
183 # (e.g. from "word" to "newword" as "[-word-]{+newword+}"), but
184 # changes to non-word characters are shown character wise (e.g. from
185 # "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
186 # addition. See t/ for some tests and examples.
187 wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
189 # Rules to allow diffing of some binary files. Disabled by default to prevent
190 # repositories from running them on arbitrary files via a local .gitattributes
191 # file. Copy them to .git/config of the repository to enable them.
193 # "sh -c '..' ARGV0" is used when the programs require additional arguments
194 # which are passed after ARGV0 by git.
196 # textconv = gzip -d -c
198 # textconv = sh -c 'exec pdftotext "$@" -' ARGV0
200 # textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0
203 # When using git format-patch use threads and add all patches as
204 # replies to the first one.
208 # Don't create .git/hooks with any sample hooks. Reduces the clutter
209 # in new git repositories.
211 # Keep the default branch name
212 defaultBranch = master
215 # Don't require <Return> in interactive commands which require only a
216 # single key, for example `git add --patch`. Requires Perl module
221 # Display branches/tag names in log (same as log's --decorate option).
223 # If a single file is given to `git log`, automatically use --follow.
229 # Merge upstream branch if `git merge` is called without arguments.
230 defaultToUpstream = true
233 # Use pager for the following commands.
238 # When running git push without a refspec push only the current
239 # branch, see man page git-config(1) for details. Default since Git
244 # Use single-letter command names in git rebase -i which are faster to
246 abbreviateCommands = true
249 # Ignore embedded bare repositories to prevent executing arbitrary
250 # commands from untrusted repositories
251 bareRepository = explicit
254 # Sort tags as version numbers
255 sort = version:refname
258 # Automatically fsck objects when receiving them (respected by git
259 # receive-pack and git fetch (>= 1.7.8, for fetch)).
266 # My SSH config already uses ControlMaster where appropriate.
268 # Don't upgrade repositories automatically
269 autoupgraderepository = false
270 # Force `git add` to add to git, never to annex
271 gitaddtoannex = false
272 # Consider dotfiles to be `git annex add`able; restrictions of
273 # annex.largefiles (if set) are still applied