chiark / gitweb /
dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
[profile] / dot / gitconfig.in
1 ### -*-conf-*-
2 ### Git configuration
3
4 [core]
5         filemode = true
6         excludesfile = @profile@/git/gitignore
7         attributesfile = @profile@/git/attributes
8         whitespace = trailing-space,space-before-tab,indent-with-non-tab
9
10 [user]
11         name = Mark Wooding
12         email = mdw@distorted.org.uk
13         signingkey = @releasekey@
14
15 [annex]
16         sshcaching = false
17
18 [merge]
19         summary = true
20         tool = emerge
21         conflictStyle = diff3
22
23 [mergetool "emerge"]
24         path = emerge-hack
25
26 [diff]
27         renames = copies
28         renameLimit = 1024
29         wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
30
31 [diff "lisp"]
32         xfuncname = "^((\\(|\\s*\\(def).*$)"
33
34 [log]
35         date = rfc
36         decorate = true
37
38 [rebase]
39         autosquash = true
40
41 [push]
42         default = matching
43
44 [format]
45         headers = "Organization: Straylight/Edgeware\n"
46
47 [color]
48         ui = auto
49
50 [color "diff"]
51         plain = normal
52         meta = bold
53         new = green
54         old = red
55         commit = bold yellow
56         whitespace = reverse red
57
58 [color "interactive"]
59         prompt = bold yellow
60         header = bold
61         help = green
62         error = bold red
63
64 [color "status"]
65         header = bold
66         added = bold green
67         changed = bold blue
68         untracked = bold red
69
70 [color "branch"]
71         current = bold
72         local = normal
73         remote = cyan
74
75 [color "grep"]
76         external = --color=always
77
78 [pager]
79         log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
80         show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
81         diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
82
83 [alias]
84         egrep = "grep -E"
85         patch = "format-patch -o p -s"
86         graph = "log --pretty=oneline --abbrev-commit --graph"
87         release = !"sh -e -c ' \
88                 [ $# -gt 0 ] || { \
89                   echo >&2 \"usage: git release TAG [OPTS]\"; \
90                   exit 1; \
91                 }; \
92                 git tag -as -m \"Release $1.\" \"$@\"' release"
93         amend = !"env EDITOR=true VISUAL=true git commit --amend -a"
94         spaces = !"sh -e -c 'git ls-files -z \"$@\"| \
95                 xargs -0r space -cv' spaces"
96         mailto = "send-email \
97                         --quiet \
98                         --no-chain-reply-to \
99                         --no-signed-off-by-cc \
100                         --to"
101         files = "ls-files --exclude-standard"
102         unstg = !"sh -e -c ' \
103                 : ${GIT_DIR=$(git rev-parse --git-dir)}; \
104                 if [ $# -eq 0 ]; then set -- \"$(stg branch)\"; fi; \
105                 for branch; do \
106                   rmdir \"$GIT_DIR/patches/$branch/patches\"; \
107                   rm -rf \"$GIT_DIR/patches/$branch\"; \
108                   git for-each-ref -s \
109                     --format \"git update-ref -d %(refname) %(objectname)\" \
110                     \"refs/patches/$branch\" \"refs/bases/$branch\" | \
111                     sh -e; \
112                 done' unstg"
113
114 [rerere]
115         enabled = yes
116         autoupdate = yes
117
118 [stgit]
119         autoresolved = yes
120         smtpdelay = 0
121
122 [mail "alias"]
123         git = git@vger.kernel.org
124         mdw = mdw@distorted.org.uk
125
126 [sendemail]
127         from = Mark Wooding <mdw@distorted.org.uk>
128         aliasesfile = @profile@/dot/mailrc
129         aliasfiletype = mailrc
130         chainreplyto = no
131         signedoffbycc = yes
132         suppresscc = self
133
134 [gui]
135         fontui = -family Sans -size 10
136         fontdiff = -family Fixed -size 13
137
138 [http]
139         cookiefile = @home@/.gitcookies