Commit | Line | Data |
---|---|---|
5622a4e0 MW |
1 | ### -*-conf-*- |
2 | ### Git configuration | |
3 | ||
5d2b7dab MW |
4 | [core] |
5 | filemode = true | |
73165cde | 6 | excludesfile = @profile@/git/gitignore |
5d2b7dab | 7 | |
ad43d821 MW |
8 | [user] |
9 | name = Mark Wooding | |
7dc35f04 | 10 | email = mdw@distorted.org.uk |
ce178f96 | 11 | signingkey = @releasekey@ |
ad43d821 MW |
12 | |
13 | [merge] | |
14 | summary = true | |
547fb8af MW |
15 | tool = emerge |
16 | ||
17 | [mergetool "emerge"] | |
18 | path = emerge-hack | |
ad43d821 MW |
19 | |
20 | [diff] | |
ad43d821 | 21 | renames = copies |
ca475e8d | 22 | wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]] |
e818009e | 23 | |
2a39ff36 MW |
24 | [diff "lisp"] |
25 | xfuncname = "^\\s*\\(def.*$" | |
26 | ||
3b73ac92 MW |
27 | [log] |
28 | date = rfc | |
29 | decorate = true | |
30 | ||
518aede4 MW |
31 | [rebase] |
32 | autosquash = true | |
33 | ||
5d2b7dab MW |
34 | [format] |
35 | headers = "Organization: Straylight/Edgeware\n" | |
36 | ||
e818009e | 37 | [color] |
3b73ac92 | 38 | ui = auto |
5d2b7dab MW |
39 | |
40 | [color "diff"] | |
41 | plain = normal | |
42 | meta = bold | |
8b6bc589 MW |
43 | new = green |
44 | old = red | |
5d2b7dab MW |
45 | commit = bold yellow |
46 | whitespace = reverse red | |
47 | ||
49f353d7 | 48 | [color "interactive"] |
726466db MW |
49 | prompt = bold yellow |
50 | header = bold | |
51 | help = green | |
52 | error = bold red | |
49f353d7 | 53 | |
5d2b7dab MW |
54 | [color "status"] |
55 | header = bold | |
56 | added = bold green | |
57 | changed = bold blue | |
58 | untracked = bold red | |
59 | ||
60 | [color "branch"] | |
61 | current = bold | |
62 | local = normal | |
63 | remote = cyan | |
64 | ||
49f353d7 MW |
65 | [color "grep"] |
66 | external = --color=always | |
67 | ||
5d2b7dab MW |
68 | [alias] |
69 | egrep = "grep -E" | |
70 | patch = "format-patch -o p -s" | |
3b73ac92 | 71 | graph = "log --pretty=oneline --abbrev-commit --graph" |
7e2c05e9 | 72 | release = !"sh -e -c ' \ |
cef39ac8 | 73 | [ $# -gt 0 ] || { \ |
5622a4e0 | 74 | echo >&2 \"usage: git release TAG [OPTS]\"; \ |
cef39ac8 MW |
75 | exit 1; \ |
76 | }; \ | |
5622a4e0 | 77 | git tag -as -m \"Release $1.\" \"$@\"' release" |
6fc9ca84 | 78 | amend = !"env EDITOR=true VISUAL=true git commit --amend -a" |
5622a4e0 MW |
79 | spaces = !"sh -e -c 'git ls-files -z \"$@\"| \ |
80 | xargs -0r space -cv' spaces" | |
5d2b7dab MW |
81 | mailto = "send-email \ |
82 | --quiet \ | |
83 | --no-chain-reply-to \ | |
84 | --no-signed-off-by-cc \ | |
85 | --to" | |
9931fa54 | 86 | files = "ls-files --exclude-standard" |
307d3be5 MW |
87 | unstg = !"sh -e -c ' \ |
88 | : ${GIT_DIR=$(git rev-parse --git-dir)}; \ | |
89 | if [ $# -eq 0 ]; then set -- \"$(stg branch)\"; fi; \ | |
90 | for branch; do \ | |
91 | rmdir \"$GIT_DIR/patches/$branch/patches\"; \ | |
92 | rm -rf \"$GIT_DIR/patches/$branch\"; \ | |
93 | git for-each-ref -s \ | |
94 | --format \"git update-ref -d %(refname) %(objectname)\" \ | |
95 | \"refs/patches/$branch\" \"refs/bases/$branch\" | \ | |
96 | sh -e; \ | |
97 | done' unstg" | |
f13876a5 | 98 | |
f4daab03 MW |
99 | [rerere] |
100 | enabled = yes | |
101 | ||
75d08fb2 MW |
102 | [stgit] |
103 | autoresolved = yes | |
104 | smtpdelay = 0 | |
105 | ||
f13876a5 MW |
106 | [mail "alias"] |
107 | git = git@vger.kernel.org | |
108 | mdw = mdw@distorted.org.uk | |
547fb8af | 109 | |
560a4aa7 | 110 | [sendemail] |
73165cde MW |
111 | from = Mark Wooding <mdw@distorted.org.uk> |
112 | aliasesfile = @profile@/dot/mailrc | |
113 | aliasfiletype = mailrc | |
560a4aa7 | 114 | chainreplyto = no |
73165cde MW |
115 | signedoffbycc = yes |
116 | suppresscc = self | |
560a4aa7 | 117 | |
ecaa0c5b | 118 | [gui] |
f444229a MW |
119 | fontui = -family Sans -size 10 |
120 | fontdiff = -family MiscFixed6x13 -size 10 |