Commit | Line | Data |
---|---|---|
5622a4e0 MW |
1 | ### -*-conf-*- |
2 | ### Git configuration | |
3 | ||
5d2b7dab MW |
4 | [core] |
5 | filemode = true | |
ce178f96 | 6 | excludesfile = @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 |
e818009e | 22 | |
2a39ff36 MW |
23 | [diff "lisp"] |
24 | xfuncname = "^\\s*\\(def.*$" | |
25 | ||
5d2b7dab MW |
26 | [format] |
27 | headers = "Organization: Straylight/Edgeware\n" | |
28 | ||
e818009e MW |
29 | [color] |
30 | diff = auto | |
31 | status = auto | |
32 | branch = auto | |
b883d4cb | 33 | interactive = auto |
49f353d7 | 34 | grep = auto |
5d2b7dab MW |
35 | |
36 | [color "diff"] | |
37 | plain = normal | |
38 | meta = bold | |
8b6bc589 MW |
39 | new = green |
40 | old = red | |
5d2b7dab MW |
41 | commit = bold yellow |
42 | whitespace = reverse red | |
43 | ||
49f353d7 MW |
44 | [color "interactive"] |
45 | prompt = bold yellow | |
46 | header = bold | |
47 | help = green | |
48 | error = bold red | |
49 | ||
5d2b7dab MW |
50 | [color "status"] |
51 | header = bold | |
52 | added = bold green | |
53 | changed = bold blue | |
54 | untracked = bold red | |
55 | ||
56 | [color "branch"] | |
57 | current = bold | |
58 | local = normal | |
59 | remote = cyan | |
60 | ||
49f353d7 MW |
61 | [color "grep"] |
62 | external = --color=always | |
63 | ||
5d2b7dab MW |
64 | [alias] |
65 | egrep = "grep -E" | |
66 | patch = "format-patch -o p -s" | |
7e2c05e9 | 67 | release = !"sh -e -c ' \ |
cef39ac8 | 68 | [ $# -gt 0 ] || { \ |
5622a4e0 | 69 | echo >&2 \"usage: git release TAG [OPTS]\"; \ |
cef39ac8 MW |
70 | exit 1; \ |
71 | }; \ | |
5622a4e0 | 72 | git tag -as -m \"Release $1.\" \"$@\"' release" |
6fc9ca84 | 73 | amend = !"env EDITOR=true VISUAL=true git commit --amend -a" |
5622a4e0 MW |
74 | spaces = !"sh -e -c 'git ls-files -z \"$@\"| \ |
75 | xargs -0r space -cv' spaces" | |
5d2b7dab MW |
76 | mailto = "send-email \ |
77 | --quiet \ | |
78 | --no-chain-reply-to \ | |
79 | --no-signed-off-by-cc \ | |
80 | --to" | |
9931fa54 | 81 | files = "ls-files --exclude-standard" |
307d3be5 MW |
82 | unstg = !"sh -e -c ' \ |
83 | : ${GIT_DIR=$(git rev-parse --git-dir)}; \ | |
84 | if [ $# -eq 0 ]; then set -- \"$(stg branch)\"; fi; \ | |
85 | for branch; do \ | |
86 | rmdir \"$GIT_DIR/patches/$branch/patches\"; \ | |
87 | rm -rf \"$GIT_DIR/patches/$branch\"; \ | |
88 | git for-each-ref -s \ | |
89 | --format \"git update-ref -d %(refname) %(objectname)\" \ | |
90 | \"refs/patches/$branch\" \"refs/bases/$branch\" | \ | |
91 | sh -e; \ | |
92 | done' unstg" | |
f13876a5 | 93 | |
75d08fb2 MW |
94 | [stgit] |
95 | autoresolved = yes | |
96 | smtpdelay = 0 | |
97 | ||
f13876a5 MW |
98 | [mail "alias"] |
99 | git = git@vger.kernel.org | |
100 | mdw = mdw@distorted.org.uk | |
547fb8af | 101 | |
560a4aa7 MW |
102 | [sendemail] |
103 | chainreplyto = no | |
104 | signedoffcc = yes | |
105 | ||
ecaa0c5b | 106 | [gui] |
f444229a MW |
107 | fontui = -family Sans -size 10 |
108 | fontdiff = -family MiscFixed6x13 -size 10 |