chiark / gitweb /
emerge-hack: A new script for Git merging.
[profile] / gitconfig
CommitLineData
5d2b7dab
MW
1[core]
2 filemode = true
3
ad43d821
MW
4[user]
5 name = Mark Wooding
7dc35f04 6 email = mdw@distorted.org.uk
ad43d821
MW
7
8[merge]
9 summary = true
547fb8af
MW
10 tool = emerge
11
12[mergetool "emerge"]
13 path = emerge-hack
ad43d821
MW
14
15[diff]
ad43d821 16 renames = copies
e818009e 17
5d2b7dab
MW
18[format]
19 headers = "Organization: Straylight/Edgeware\n"
20
e818009e
MW
21[color]
22 diff = auto
23 status = auto
24 branch = auto
5d2b7dab
MW
25
26[color "diff"]
27 plain = normal
28 meta = bold
29 new = bold green
30 old = bold red
31 commit = bold yellow
32 whitespace = reverse red
33
34[color "status"]
35 header = bold
36 added = bold green
37 changed = bold blue
38 untracked = bold red
39
40[color "branch"]
41 current = bold
42 local = normal
43 remote = cyan
44
45[alias]
46 egrep = "grep -E"
47 patch = "format-patch -o p -s"
48 mailto = "send-email \
49 --quiet \
50 --no-chain-reply-to \
51 --no-signed-off-by-cc \
52 --to"
f13876a5 53
75d08fb2
MW
54[stgit]
55 autoresolved = yes
56 smtpdelay = 0
57
f13876a5
MW
58[mail "alias"]
59 git = git@vger.kernel.org
60 mdw = mdw@distorted.org.uk
547fb8af 61
ecaa0c5b
MW
62[gui]
63 fontui = -family helvetica -size 11 -weight normal -slant roman -underline 0 -overstrike 0
4d93931d 64 fontdiff = -family fixed -size 10 -weight normal -slant roman -underline 0 -overstrike 0