dot/gitconfig.in: Push the current branch only by default.
[profile] / dot / gitconfig.in
CommitLineData
5622a4e0
MW
1### -*-conf-*-
2### Git configuration
3
5d2b7dab
MW
4[core]
5 filemode = true
73165cde 6 excludesfile = @profile@/git/gitignore
d3f879c6 7 attributesfile = @profile@/git/attributes
37dfb719 8 whitespace = trailing-space,space-before-tab,indent-with-non-tab
5d2b7dab 9
ad43d821
MW
10[user]
11 name = Mark Wooding
7dc35f04 12 email = mdw@distorted.org.uk
ce178f96 13 signingkey = @releasekey@
ad43d821 14
3c40e452
MW
15[annex]
16 sshcaching = false
17
ad43d821
MW
18[merge]
19 summary = true
547fb8af 20 tool = emerge
5ffa4795 21 conflictStyle = diff3
547fb8af
MW
22
23[mergetool "emerge"]
24 path = emerge-hack
ad43d821
MW
25
26[diff]
ad43d821 27 renames = copies
755f6621 28 renameLimit = 1024
ca475e8d 29 wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
e818009e 30
2a39ff36 31[diff "lisp"]
085ca2e7 32 xfuncname = "^((\\(|\\s*\\(def).*$)"
2a39ff36 33
3b73ac92
MW
34[log]
35 date = rfc
36 decorate = true
0e511e25 37 follow = true
a965d521 38 mailmap = true
3b73ac92 39
518aede4
MW
40[rebase]
41 autosquash = true
42
da0af0a9 43[push]
66cffbdc 44 default = upstream
67b5b0ce 45 followTags = true
da0af0a9 46
5d2b7dab
MW
47[format]
48 headers = "Organization: Straylight/Edgeware\n"
9ca6d190 49 from = Mark Wooding <@email@>
570c7b19
MW
50 coverletter = auto
51 thread = shallow
52 signature = "[mdw]"
9ca6d190 53 outputdirectory = p/
5d2b7dab 54
e818009e 55[color]
3b73ac92 56 ui = auto
5d2b7dab
MW
57
58[color "diff"]
59 plain = normal
60 meta = bold
8b6bc589
MW
61 new = green
62 old = red
5d2b7dab
MW
63 commit = bold yellow
64 whitespace = reverse red
65
49f353d7 66[color "interactive"]
726466db
MW
67 prompt = bold yellow
68 header = bold
69 help = green
70 error = bold red
49f353d7 71
5d2b7dab
MW
72[color "status"]
73 header = bold
74 added = bold green
75 changed = bold blue
76 untracked = bold red
77
78[color "branch"]
79 current = bold
80 local = normal
81 remote = cyan
82
1f39b1c7
MW
83[column]
84 ui = auto column dense
85
bd67e4dc 86[pager]
517b9a6d
MW
87 log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
88 show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
89 diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
bd67e4dc 90
5d2b7dab 91[alias]
71c95f6f
MW
92 do = "!sh -e -c ' \
93 quiet=; \
94 case $#,$1 in 0, | *,*,*) ;; *,-q) quiet=--quiet; shift ;; esac; \
95 case $quiet in ?*) ;; *) echo \"Entering toplevel\" ;; esac; \
96 (name=\"<toplevel>\"; path=.; toplevel=$(pwd); \
97 sha1=$(git rev-parse HEAD); \
98 set +e; case $# in 1) eval \"$1\" ;; *) \"$@\" ;; esac); \
99 exec git submodule $quiet foreach --recursive \"$@\"' do"
5d2b7dab 100 egrep = "grep -E"
3b73ac92 101 graph = "log --pretty=oneline --abbrev-commit --graph"
7e2c05e9 102 release = !"sh -e -c ' \
cef39ac8 103 [ $# -gt 0 ] || { \
5622a4e0 104 echo >&2 \"usage: git release TAG [OPTS]\"; \
cef39ac8
MW
105 exit 1; \
106 }; \
5622a4e0 107 git tag -as -m \"Release $1.\" \"$@\"' release"
9cacd266
MW
108 catchup = !"perl -e ' \
109 use autodie qw(:all); \
110 if (@ARGV < 2) { \
111 print STDERR \"git catchup REMOTE REF ...\n\"; \
112 exit 2; \
113 } \
114 @c = (); $m = shift @ARGV; \
115 for my $r (@ARGV) { \
116 my ($p, $r) = $r =~ /^([+]*)(.*)$/; \
117 push @c, \"$p$m/$r:$r\"; \
118 } \
119 exec \"git\", \"push\", \".\", @c'"
6fc9ca84 120 amend = !"env EDITOR=true VISUAL=true git commit --amend -a"
5622a4e0
MW
121 spaces = !"sh -e -c 'git ls-files -z \"$@\"| \
122 xargs -0r space -cv' spaces"
9931fa54 123 files = "ls-files --exclude-standard"
307d3be5
MW
124 unstg = !"sh -e -c ' \
125 : ${GIT_DIR=$(git rev-parse --git-dir)}; \
126 if [ $# -eq 0 ]; then set -- \"$(stg branch)\"; fi; \
127 for branch; do \
128 rmdir \"$GIT_DIR/patches/$branch/patches\"; \
129 rm -rf \"$GIT_DIR/patches/$branch\"; \
130 git for-each-ref -s \
131 --format \"git update-ref -d %(refname) %(objectname)\" \
132 \"refs/patches/$branch\" \"refs/bases/$branch\" | \
133 sh -e; \
134 done' unstg"
f13876a5 135
f4daab03
MW
136[rerere]
137 enabled = yes
5ccb9ae3 138 autoupdate = yes
f4daab03 139
75d08fb2
MW
140[stgit]
141 autoresolved = yes
142 smtpdelay = 0
143
f13876a5
MW
144[mail "alias"]
145 git = git@vger.kernel.org
146 mdw = mdw@distorted.org.uk
547fb8af 147
560a4aa7 148[sendemail]
73165cde
MW
149 from = Mark Wooding <mdw@distorted.org.uk>
150 aliasesfile = @profile@/dot/mailrc
151 aliasfiletype = mailrc
560a4aa7 152 chainreplyto = no
6690f2cc 153 thread = no
73165cde
MW
154 signedoffbycc = yes
155 suppresscc = self
560a4aa7 156
619db0bb
MW
157[mailinfo]
158 scissors = true
159
ecaa0c5b 160[gui]
f444229a 161 fontui = -family Sans -size 10
a6780078 162 fontdiff = -family Fixed -size 13
e6a7e588
MW
163
164[http]
165 cookiefile = @home@/.gitcookies