~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dot/emacs: Add chiark email addresses.
[profile]
/
dot
/
gitconfig.in
diff --git
a/dot/gitconfig.in
b/dot/gitconfig.in
index
5ea026a
..
c642c13
100644
(file)
--- a/
dot/gitconfig.in
+++ b/
dot/gitconfig.in
@@
-4,12
+4,17
@@
[core]
filemode = true
excludesfile = @profile@/git/gitignore
[core]
filemode = true
excludesfile = @profile@/git/gitignore
+ attributesfile = @profile@/git/attributes
+ whitespace = trailing-space,space-before-tab,indent-with-non-tab
[user]
name = Mark Wooding
email = mdw@distorted.org.uk
signingkey = @releasekey@
[user]
name = Mark Wooding
email = mdw@distorted.org.uk
signingkey = @releasekey@
+[annex]
+ sshcaching = false
+
[merge]
summary = true
tool = emerge
[merge]
summary = true
tool = emerge
@@
-19,9
+24,11
@@
[diff]
renames = copies
[diff]
renames = copies
+ renameLimit = 1024
+ wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
[diff "lisp"]
[diff "lisp"]
- xfuncname = "^
\\s*\\(def.*$
"
+ xfuncname = "^
((\\(|\\s*\\(def).*$)
"
[log]
date = rfc
[log]
date = rfc
@@
-30,6
+37,9
@@
[rebase]
autosquash = true
[rebase]
autosquash = true
+[push]
+ default = matching
+
[format]
headers = "Organization: Straylight/Edgeware\n"
[format]
headers = "Organization: Straylight/Edgeware\n"
@@
-97,6
+107,7
@@
[rerere]
enabled = yes
[rerere]
enabled = yes
+ autoupdate = yes
[stgit]
autoresolved = yes
[stgit]
autoresolved = yes
@@
-116,4
+127,4
@@
[gui]
fontui = -family Sans -size 10
[gui]
fontui = -family Sans -size 10
- fontdiff = -family
MiscFixed6x13 -size 10
+ fontdiff = -family
Fixed -size 13