chiark / gitweb /
Merge remote-tracking branch 'staging'
[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         follow = true
38         mailmap = true
39
40 [rebase]
41         autosquash = true
42
43 [push]
44         default = matching
45         followTags = true
46
47 [format]
48         headers = "Organization: Straylight/Edgeware\n"
49         coverletter = auto
50         thread = shallow
51         signature = "[mdw]"
52
53 [color]
54         ui = auto
55
56 [color "diff"]
57         plain = normal
58         meta = bold
59         new = green
60         old = red
61         commit = bold yellow
62         whitespace = reverse red
63
64 [color "interactive"]
65         prompt = bold yellow
66         header = bold
67         help = green
68         error = bold red
69
70 [color "status"]
71         header = bold
72         added = bold green
73         changed = bold blue
74         untracked = bold red
75
76 [color "branch"]
77         current = bold
78         local = normal
79         remote = cyan
80
81 [color "grep"]
82         external = --color=always
83
84 [pager]
85         log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
86         show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
87         diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
88
89 [alias]
90         egrep = "grep -E"
91         patches = "format-patch --full-index"
92         graph = "log --pretty=oneline --abbrev-commit --graph"
93         release = !"sh -e -c ' \
94                 [ $# -gt 0 ] || { \
95                   echo >&2 \"usage: git release TAG [OPTS]\"; \
96                   exit 1; \
97                 }; \
98                 git tag -as -m \"Release $1.\" \"$@\"' release"
99         amend = !"env EDITOR=true VISUAL=true git commit --amend -a"
100         spaces = !"sh -e -c 'git ls-files -z \"$@\"| \
101                 xargs -0r space -cv' spaces"
102         files = "ls-files --exclude-standard"
103         unstg = !"sh -e -c ' \
104                 : ${GIT_DIR=$(git rev-parse --git-dir)}; \
105                 if [ $# -eq 0 ]; then set -- \"$(stg branch)\"; fi; \
106                 for branch; do \
107                   rmdir \"$GIT_DIR/patches/$branch/patches\"; \
108                   rm -rf \"$GIT_DIR/patches/$branch\"; \
109                   git for-each-ref -s \
110                     --format \"git update-ref -d %(refname) %(objectname)\" \
111                     \"refs/patches/$branch\" \"refs/bases/$branch\" | \
112                     sh -e; \
113                 done' unstg"
114
115 [rerere]
116         enabled = yes
117         autoupdate = yes
118
119 [stgit]
120         autoresolved = yes
121         smtpdelay = 0
122
123 [mail "alias"]
124         git = git@vger.kernel.org
125         mdw = mdw@distorted.org.uk
126
127 [sendemail]
128         from = Mark Wooding <mdw@distorted.org.uk>
129         aliasesfile = @profile@/dot/mailrc
130         aliasfiletype = mailrc
131         chainreplyto = no
132         thread = no
133         signedoffbycc = yes
134         suppresscc = self
135
136 [gui]
137         fontui = -family Sans -size 10
138         fontdiff = -family Fixed -size 13
139
140 [http]
141         cookiefile = @home@/.gitcookies