chiark / gitweb /
emerge-hack: A new script for Git merging.
[profile] / gitconfig
1 [core]
2         filemode = true
3
4 [user]
5         name = Mark Wooding
6         email = mdw@distorted.org.uk
7
8 [merge]
9         summary = true
10         tool = emerge
11
12 [mergetool "emerge"]
13         path = emerge-hack
14
15 [diff]
16         renames = copies
17
18 [format]
19         headers = "Organization: Straylight/Edgeware\n"
20
21 [color]
22         diff = auto
23         status = auto
24         branch = auto
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"
53
54 [stgit]
55         autoresolved = yes
56         smtpdelay = 0
57
58 [mail "alias"]
59         git = git@vger.kernel.org
60         mdw = mdw@distorted.org.uk
61
62 [gui]
63         fontui = -family helvetica -size 11 -weight normal -slant roman -underline 0 -overstrike 0
64         fontdiff = -family fixed -size 10 -weight normal -slant roman -underline 0 -overstrike 0