dot/gitconfig.in: Add explicit `pull' setting.
[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 [pull]
44 rebase = false
45
46 [push]
47 default = upstream
48 followTags = true
49
50 [format]
51 headers = "Organization: Straylight/Edgeware\n"
52 from = Mark Wooding <@email@>
53 coverletter = auto
54 thread = shallow
55 signature = "[mdw]"
56 outputdirectory = p/
57
58 [color]
59 ui = auto
60
61 [color "diff"]
62 plain = normal
63 meta = bold
64 new = green
65 old = red
66 commit = bold yellow
67 whitespace = reverse red
68
69 [color "interactive"]
70 prompt = bold yellow
71 header = bold
72 help = green
73 error = bold red
74
75 [color "status"]
76 header = bold
77 added = bold green
78 changed = bold blue
79 untracked = bold red
80
81 [color "branch"]
82 current = bold
83 local = normal
84 remote = cyan
85
86 [column]
87 ui = auto column dense
88
89 [pager]
90 log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
91 show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
92 diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
93
94 [alias]
95 do = "!sh -e -c ' \
96 quiet=; \
97 case $#,$1 in 0, | *,*,*) ;; *,-q) quiet=--quiet; shift ;; esac; \
98 case $quiet in ?*) ;; *) echo \"Entering toplevel\" ;; esac; \
99 (name=\"<toplevel>\"; path=.; toplevel=$(pwd); \
100 sha1=$(git rev-parse HEAD); \
101 set +e; case $# in 1) eval \"$1\" ;; *) \"$@\" ;; esac); \
102 exec git submodule $quiet foreach --recursive \"$@\"' do"
103 egrep = "grep -E"
104 graph = "log --pretty=oneline --abbrev-commit --graph"
105 release = !"sh -e -c ' \
106 [ $# -gt 0 ] || { \
107 echo >&2 \"usage: git release TAG [OPTS]\"; \
108 exit 1; \
109 }; \
110 git tag -as -m \"Release $1.\" \"$@\"' release"
111 catchup = !"perl -e ' \
112 use autodie qw(:all); \
113 if (@ARGV < 2) { \
114 print STDERR \"git catchup REMOTE REF ...\n\"; \
115 exit 2; \
116 } \
117 @c = (); $m = shift @ARGV; \
118 for my $r (@ARGV) { \
119 my ($p, $r) = $r =~ /^([+]*)(.*)$/; \
120 push @c, \"$p$m/$r:$r\"; \
121 } \
122 exec \"git\", \"push\", \".\", @c'"
123 amend = !"env EDITOR=true VISUAL=true git commit --amend -a"
124 spaces = !"sh -e -c 'git ls-files -z \"$@\"| \
125 xargs -0r space -cv' spaces"
126 files = "ls-files --exclude-standard"
127 unstg = !"sh -e -c ' \
128 : ${GIT_DIR=$(git rev-parse --git-dir)}; \
129 if [ $# -eq 0 ]; then set -- \"$(stg branch)\"; fi; \
130 for branch; do \
131 rmdir \"$GIT_DIR/patches/$branch/patches\"; \
132 rm -rf \"$GIT_DIR/patches/$branch\"; \
133 git for-each-ref -s \
134 --format \"git update-ref -d %(refname) %(objectname)\" \
135 \"refs/patches/$branch\" \"refs/bases/$branch\" | \
136 sh -e; \
137 done' unstg"
138
139 [rerere]
140 enabled = yes
141 autoupdate = yes
142
143 [stgit]
144 autoresolved = yes
145 smtpdelay = 0
146
147 [mail "alias"]
148 git = git@vger.kernel.org
149 mdw = mdw@distorted.org.uk
150
151 [sendemail]
152 from = Mark Wooding <mdw@distorted.org.uk>
153 aliasesfile = @profile@/dot/mailrc
154 aliasfiletype = mailrc
155 chainreplyto = no
156 thread = no
157 signedoffbycc = yes
158 suppresscc = self
159
160 [mailinfo]
161 scissors = true
162
163 [gui]
164 fontui = -family Sans -size 10
165 fontdiff = -family Fixed -size 13
166
167 [http]
168 cookiefile = @home@/.gitcookies