chiark / gitweb /
Merge remote branch 'ponder'
[profile] / dot / gitconfig.in
1 ### -*-conf-*-
2 ### Git configuration
3
4 [core]
5         filemode = true
6         excludesfile = @gitignore@
7
8 [user]
9         name = Mark Wooding
10         email = mdw@distorted.org.uk
11         signingkey = @releasekey@
12
13 [merge]
14         summary = true
15         tool = emerge
16
17 [mergetool "emerge"]
18         path = emerge-hack
19
20 [diff]
21         renames = copies
22
23 [diff "lisp"]
24         xfuncname = "^\\s*\\(def.*$"
25
26 [format]
27         headers = "Organization: Straylight/Edgeware\n"
28
29 [color]
30         diff = auto
31         status = auto
32         branch = auto
33         interactive = auto
34         grep = auto
35
36 [color "diff"]
37         plain = normal
38         meta = bold
39         new = green
40         old = red
41         commit = bold yellow
42         whitespace = reverse red
43
44 [color "interactive"]
45         prompt = bold yellow
46         header = bold
47         help = green
48         error = bold red
49
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
61 [color "grep"]
62         external = --color=always
63
64 [alias]
65         egrep = "grep -E"
66         patch = "format-patch -o p -s"
67         release = !"sh -e -c ' \
68                 [ $# -gt 0 ] || { \
69                   echo >&2 \"usage: git release TAG [OPTS]\"; \
70                   exit 1; \
71                 }; \
72                 git tag -as -m \"Release $1.\" \"$@\"' release"
73         amend = !"env EDITOR=true VISUAL=true git commit --amend -a"
74         spaces = !"sh -e -c 'git ls-files -z \"$@\"| \
75                 xargs -0r space -cv' spaces"
76         mailto = "send-email \
77                         --quiet \
78                         --no-chain-reply-to \
79                         --no-signed-off-by-cc \
80                         --to"
81         files = "ls-files --exclude-standard"
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"
93
94 [stgit]
95         autoresolved = yes
96         smtpdelay = 0
97
98 [mail "alias"]
99         git = git@vger.kernel.org
100         mdw = mdw@distorted.org.uk
101
102 [sendemail]
103         chainreplyto = no
104         signedoffcc = yes
105
106 [gui]
107         fontui = -family Sans -size 10
108         fontdiff = -family MiscFixed6x13 -size 10