1 # Global Git configuration file.
3 # Copyright (C) 2011-2013 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/>.
24 email = simon@ruderich.org
34 # Function in hunk header.
35 function = magenta bold
46 # Use pager for the following commands.
52 # Don't require <Return> in interactive commands which require only a
53 # single key, for example `git add --patch`.
57 ## Shortcuts for often used commands.
64 dw = diff PATIENCE --color-words
65 dc = diff PATIENCE --cached
66 dcw = diff PATIENCE --cached --color-words
71 lp = log --patch PATIENCE
72 lpw = log --patch PATIENCE --color-words
82 mo = merge origin/master
89 # Parallel git remote update. Also strips unnecessary output.
91 | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
93 /^Please make sure you have the correct access rights$/d; \
94 /^and the repository exists\\.$/d;'"
95 # Push to all remotes. Thanks to albel727 in #git on Freenode
96 # (2011-06-04 16:06 CEST) for the idea. Modified to push in parallel
97 # and to strip unnecessary output.
99 | xargs -d '\\n' -n1 -P0 git push 2>&1 \
101 /^Please make sure you have the correct access rights$/d; \
102 /^and the repository exists\\.$/d;'"
106 # (Redirection of stderr is necessary to prevent missing output with
107 # my "color stderr" solution in Zsh.)
108 fs = ! git fsck --strict --full 2>&1
109 fg = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo
113 ssk = stash save --keep-index
119 # tig-like log view. Similar to the following but with author/date
120 # information. --pretty=format is not used because it doesn't allow
121 # precise enough control over formats and colors.
123 # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
126 # Create backup of uncommitted and untracked changes.
127 ssb = "! git stash save --include-untracked \
128 \"Backup on $(date -R)\" >/dev/null \
129 && git stash apply >/dev/null"
131 # Display list and content of untracked files. Untracked directories
132 # and symbolic links are only listed.
133 u = "! git ls-files --other --exclude-standard --directory -z \
136 printf \"\\033[1;33m-> %s\\033[0m:\" \"$x\"; \
137 if test -d \"$x\"; then \
138 echo \" directory\"; \
139 elif test -h \"$x\"; then \
140 echo \" symbolic link\"; \
150 # Detect copies and renames.
153 # Change the definition of a word as used by diff --color-words to be
154 # shorter (not only spaces) and thus simplify the generated diffs.
155 # Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
156 # ([^a-zA-Z0-9_]), therefore changes to words are shown in complete
157 # (e.g. from "word" to "newword" as "[-word-]{+newword+}"), but
158 # changes to non-word characters are shown character wise (e.g. from
159 # "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
160 # addition. See t/ for some tests and examples.
161 wordregex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
163 # Allow diffing of some binary files.
165 # `pdftotext-` is a wrapper around pdftotext which writes to stdout.
166 # `sqlite3dump` is a wrapper calling `sqlite3 database-file .dump`.
168 textconv = gzip -d -c
170 textconv = pdftotext-
172 textconv = sqlite3dump
183 # When using git format-patch use threads and add all patches as
184 # replies to the first one.
188 # Automatically fsck objects when receiving them (respected by git
189 # receive-pack and git fetch (>= 1.7.8, for fetch)).
192 # vim: ft=gitconfig noet