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 | |
ad43d821 MW |
10 | [user] |
11 | name = Mark Wooding | |
7dc35f04 | 12 | email = mdw@distorted.org.uk |
ce178f96 | 13 | signingkey = @releasekey@ |
ad43d821 | 14 | |
3c40e452 MW |
15 | [annex] |
16 | sshcaching = false | |
17 | ||
ad43d821 MW |
18 | [merge] |
19 | summary = true | |
547fb8af | 20 | tool = emerge |
5ffa4795 | 21 | conflictStyle = diff3 |
547fb8af MW |
22 | |
23 | [mergetool "emerge"] | |
24 | path = emerge-hack | |
ad43d821 MW |
25 | |
26 | [diff] | |
ad43d821 | 27 | renames = copies |
755f6621 | 28 | renameLimit = 1024 |
ca475e8d | 29 | wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]] |
e818009e | 30 | |
2a39ff36 | 31 | [diff "lisp"] |
085ca2e7 | 32 | xfuncname = "^((\\(|\\s*\\(def).*$)" |
2a39ff36 | 33 | |
3b73ac92 MW |
34 | [log] |
35 | date = rfc | |
36 | decorate = true | |
0e511e25 | 37 | follow = true |
a965d521 | 38 | mailmap = true |
3b73ac92 | 39 | |
518aede4 MW |
40 | [rebase] |
41 | autosquash = true | |
42 | ||
da0af0a9 MW |
43 | [push] |
44 | default = matching | |
67b5b0ce | 45 | followTags = true |
da0af0a9 | 46 | |
5d2b7dab MW |
47 | [format] |
48 | headers = "Organization: Straylight/Edgeware\n" | |
570c7b19 MW |
49 | coverletter = auto |
50 | thread = shallow | |
51 | signature = "[mdw]" | |
5d2b7dab | 52 | |
e818009e | 53 | [color] |
3b73ac92 | 54 | ui = auto |
5d2b7dab MW |
55 | |
56 | [color "diff"] | |
57 | plain = normal | |
58 | meta = bold | |
8b6bc589 MW |
59 | new = green |
60 | old = red | |
5d2b7dab MW |
61 | commit = bold yellow |
62 | whitespace = reverse red | |
63 | ||
49f353d7 | 64 | [color "interactive"] |
726466db MW |
65 | prompt = bold yellow |
66 | header = bold | |
67 | help = green | |
68 | error = bold red | |
49f353d7 | 69 | |
5d2b7dab MW |
70 | [color "status"] |
71 | header = bold | |
72 | added = bold green | |
73 | changed = bold blue | |
74 | untracked = bold red | |
75 | ||
76 | [color "branch"] | |
77 | current = bold | |
78 | local = normal | |
79 | remote = cyan | |
80 | ||
49f353d7 MW |
81 | [color "grep"] |
82 | external = --color=always | |
83 | ||
1f39b1c7 MW |
84 | [column] |
85 | ui = auto column dense | |
86 | ||
bd67e4dc | 87 | [pager] |
517b9a6d MW |
88 | log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager |
89 | show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager | |
90 | diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager | |
bd67e4dc | 91 | |
5d2b7dab MW |
92 | [alias] |
93 | egrep = "grep -E" | |
3b73ac92 | 94 | graph = "log --pretty=oneline --abbrev-commit --graph" |
7e2c05e9 | 95 | release = !"sh -e -c ' \ |
cef39ac8 | 96 | [ $# -gt 0 ] || { \ |
5622a4e0 | 97 | echo >&2 \"usage: git release TAG [OPTS]\"; \ |
cef39ac8 MW |
98 | exit 1; \ |
99 | }; \ | |
5622a4e0 | 100 | git tag -as -m \"Release $1.\" \"$@\"' release" |
6fc9ca84 | 101 | amend = !"env EDITOR=true VISUAL=true git commit --amend -a" |
5622a4e0 MW |
102 | spaces = !"sh -e -c 'git ls-files -z \"$@\"| \ |
103 | xargs -0r space -cv' spaces" | |
9931fa54 | 104 | files = "ls-files --exclude-standard" |
307d3be5 MW |
105 | unstg = !"sh -e -c ' \ |
106 | : ${GIT_DIR=$(git rev-parse --git-dir)}; \ | |
107 | if [ $# -eq 0 ]; then set -- \"$(stg branch)\"; fi; \ | |
108 | for branch; do \ | |
109 | rmdir \"$GIT_DIR/patches/$branch/patches\"; \ | |
110 | rm -rf \"$GIT_DIR/patches/$branch\"; \ | |
111 | git for-each-ref -s \ | |
112 | --format \"git update-ref -d %(refname) %(objectname)\" \ | |
113 | \"refs/patches/$branch\" \"refs/bases/$branch\" | \ | |
114 | sh -e; \ | |
115 | done' unstg" | |
f13876a5 | 116 | |
f4daab03 MW |
117 | [rerere] |
118 | enabled = yes | |
5ccb9ae3 | 119 | autoupdate = yes |
f4daab03 | 120 | |
75d08fb2 MW |
121 | [stgit] |
122 | autoresolved = yes | |
123 | smtpdelay = 0 | |
124 | ||
f13876a5 MW |
125 | [mail "alias"] |
126 | git = git@vger.kernel.org | |
127 | mdw = mdw@distorted.org.uk | |
547fb8af | 128 | |
560a4aa7 | 129 | [sendemail] |
73165cde MW |
130 | from = Mark Wooding <mdw@distorted.org.uk> |
131 | aliasesfile = @profile@/dot/mailrc | |
132 | aliasfiletype = mailrc | |
560a4aa7 | 133 | chainreplyto = no |
6690f2cc | 134 | thread = no |
73165cde MW |
135 | signedoffbycc = yes |
136 | suppresscc = self | |
560a4aa7 | 137 | |
ecaa0c5b | 138 | [gui] |
f444229a | 139 | fontui = -family Sans -size 10 |
a6780078 | 140 | fontdiff = -family Fixed -size 13 |
e6a7e588 MW |
141 | |
142 | [http] | |
143 | cookiefile = @home@/.gitcookies |