Commit | Line | Data |
---|---|---|
5622a4e0 MW |
1 | ### -*-conf-*- |
2 | ### Git configuration | |
3 | ||
5d2b7dab MW |
4 | [core] |
5 | filemode = true | |
73165cde | 6 | excludesfile = @profile@/git/gitignore |
d3f879c6 | 7 | attributesfile = @profile@/git/attributes |
37dfb719 | 8 | whitespace = trailing-space,space-before-tab,indent-with-non-tab |
5d2b7dab | 9 | |
6093fc3e MW |
10 | [advice] |
11 | ignoredHook = false | |
12 | ||
ad43d821 MW |
13 | [user] |
14 | name = Mark Wooding | |
7dc35f04 | 15 | email = mdw@distorted.org.uk |
ce178f96 | 16 | signingkey = @releasekey@ |
ad43d821 | 17 | |
3c40e452 MW |
18 | [annex] |
19 | sshcaching = false | |
20 | ||
ad43d821 MW |
21 | [merge] |
22 | summary = true | |
547fb8af | 23 | tool = emerge |
5ffa4795 | 24 | conflictStyle = diff3 |
547fb8af MW |
25 | |
26 | [mergetool "emerge"] | |
27 | path = emerge-hack | |
ad43d821 MW |
28 | |
29 | [diff] | |
ad43d821 | 30 | renames = copies |
755f6621 | 31 | renameLimit = 1024 |
ca475e8d | 32 | wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]] |
e818009e | 33 | |
2a39ff36 | 34 | [diff "lisp"] |
085ca2e7 | 35 | xfuncname = "^((\\(|\\s*\\(def).*$)" |
2a39ff36 | 36 | |
3b73ac92 MW |
37 | [log] |
38 | date = rfc | |
39 | decorate = true | |
0e511e25 | 40 | follow = true |
a965d521 | 41 | mailmap = true |
3b73ac92 | 42 | |
518aede4 MW |
43 | [rebase] |
44 | autosquash = true | |
45 | ||
930a7d0f MW |
46 | [pull] |
47 | rebase = false | |
48 | ||
da0af0a9 | 49 | [push] |
66cffbdc | 50 | default = upstream |
67b5b0ce | 51 | followTags = true |
da0af0a9 | 52 | |
5d2b7dab MW |
53 | [format] |
54 | headers = "Organization: Straylight/Edgeware\n" | |
9ca6d190 | 55 | from = Mark Wooding <@email@> |
570c7b19 MW |
56 | coverletter = auto |
57 | thread = shallow | |
58 | signature = "[mdw]" | |
9ca6d190 | 59 | outputdirectory = p/ |
5d2b7dab | 60 | |
e818009e | 61 | [color] |
3b73ac92 | 62 | ui = auto |
5d2b7dab MW |
63 | |
64 | [color "diff"] | |
65 | plain = normal | |
66 | meta = bold | |
8b6bc589 MW |
67 | new = green |
68 | old = red | |
5d2b7dab MW |
69 | commit = bold yellow |
70 | whitespace = reverse red | |
71 | ||
49f353d7 | 72 | [color "interactive"] |
726466db MW |
73 | prompt = bold yellow |
74 | header = bold | |
75 | help = green | |
76 | error = bold red | |
49f353d7 | 77 | |
5d2b7dab MW |
78 | [color "status"] |
79 | header = bold | |
80 | added = bold green | |
81 | changed = bold blue | |
82 | untracked = bold red | |
83 | ||
84 | [color "branch"] | |
85 | current = bold | |
86 | local = normal | |
87 | remote = cyan | |
88 | ||
1f39b1c7 MW |
89 | [column] |
90 | ui = auto column dense | |
91 | ||
bd67e4dc | 92 | [pager] |
96ceecfb MW |
93 | diff = "if type >/dev/null 2>&1 diff-highlight; then diff-highlight; else cat; fi | mdw-pager" |
94 | log = "if type >/dev/null 2>&1 diff-highlight; then diff-highlight; else cat; fi | mdw-pager" | |
95 | show = "if type >/dev/null 2>&1 diff-highlight; then diff-highlight; else cat; fi | mdw-pager" | |
bd67e4dc | 96 | |
5d2b7dab | 97 | [alias] |
71c95f6f MW |
98 | do = "!sh -e -c ' \ |
99 | quiet=; \ | |
100 | case $#,$1 in 0, | *,*,*) ;; *,-q) quiet=--quiet; shift ;; esac; \ | |
101 | case $quiet in ?*) ;; *) echo \"Entering toplevel\" ;; esac; \ | |
102 | (name=\"<toplevel>\"; path=.; toplevel=$(pwd); \ | |
103 | sha1=$(git rev-parse HEAD); \ | |
104 | set +e; case $# in 1) eval \"$1\" ;; *) \"$@\" ;; esac); \ | |
105 | exec git submodule $quiet foreach --recursive \"$@\"' do" | |
5d2b7dab | 106 | egrep = "grep -E" |
3b73ac92 | 107 | graph = "log --pretty=oneline --abbrev-commit --graph" |
7e2c05e9 | 108 | release = !"sh -e -c ' \ |
cef39ac8 | 109 | [ $# -gt 0 ] || { \ |
5622a4e0 | 110 | echo >&2 \"usage: git release TAG [OPTS]\"; \ |
cef39ac8 MW |
111 | exit 1; \ |
112 | }; \ | |
5622a4e0 | 113 | git tag -as -m \"Release $1.\" \"$@\"' release" |
9cacd266 MW |
114 | catchup = !"perl -e ' \ |
115 | use autodie qw(:all); \ | |
116 | if (@ARGV < 2) { \ | |
117 | print STDERR \"git catchup REMOTE REF ...\n\"; \ | |
118 | exit 2; \ | |
119 | } \ | |
120 | @c = (); $m = shift @ARGV; \ | |
121 | for my $r (@ARGV) { \ | |
122 | my ($p, $r) = $r =~ /^([+]*)(.*)$/; \ | |
123 | push @c, \"$p$m/$r:$r\"; \ | |
124 | } \ | |
125 | exec \"git\", \"push\", \".\", @c'" | |
6fc9ca84 | 126 | amend = !"env EDITOR=true VISUAL=true git commit --amend -a" |
5622a4e0 MW |
127 | spaces = !"sh -e -c 'git ls-files -z \"$@\"| \ |
128 | xargs -0r space -cv' spaces" | |
9931fa54 | 129 | files = "ls-files --exclude-standard" |
307d3be5 MW |
130 | unstg = !"sh -e -c ' \ |
131 | : ${GIT_DIR=$(git rev-parse --git-dir)}; \ | |
132 | if [ $# -eq 0 ]; then set -- \"$(stg branch)\"; fi; \ | |
133 | for branch; do \ | |
134 | rmdir \"$GIT_DIR/patches/$branch/patches\"; \ | |
135 | rm -rf \"$GIT_DIR/patches/$branch\"; \ | |
136 | git for-each-ref -s \ | |
137 | --format \"git update-ref -d %(refname) %(objectname)\" \ | |
138 | \"refs/patches/$branch\" \"refs/bases/$branch\" | \ | |
139 | sh -e; \ | |
140 | done' unstg" | |
f13876a5 | 141 | |
f4daab03 MW |
142 | [rerere] |
143 | enabled = yes | |
5ccb9ae3 | 144 | autoupdate = yes |
f4daab03 | 145 | |
75d08fb2 MW |
146 | [stgit] |
147 | autoresolved = yes | |
148 | smtpdelay = 0 | |
149 | ||
f13876a5 MW |
150 | [mail "alias"] |
151 | git = git@vger.kernel.org | |
152 | mdw = mdw@distorted.org.uk | |
547fb8af | 153 | |
560a4aa7 | 154 | [sendemail] |
73165cde MW |
155 | from = Mark Wooding <mdw@distorted.org.uk> |
156 | aliasesfile = @profile@/dot/mailrc | |
157 | aliasfiletype = mailrc | |
560a4aa7 | 158 | chainreplyto = no |
6690f2cc | 159 | thread = no |
73165cde MW |
160 | signedoffbycc = yes |
161 | suppresscc = self | |
560a4aa7 | 162 | |
619db0bb MW |
163 | [mailinfo] |
164 | scissors = true | |
165 | ||
ecaa0c5b | 166 | [gui] |
f444229a | 167 | fontui = -family Sans -size 10 |
a6780078 | 168 | fontdiff = -family Fixed -size 13 |
e6a7e588 MW |
169 | |
170 | [http] | |
171 | cookiefile = @home@/.gitcookies |