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