Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 02a297d963916a6a95b1173d73fb6dc0e3bbd0bf..2bbe46482054ca90bd6f2756ae1f07dc1bb85dad 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -4,32 +4,46 @@
 [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@
 
+[annex]
+       sshcaching = false
+
 [merge]
        summary = true
        tool = emerge
+       conflictStyle = diff3
 
 [mergetool "emerge"]
        path = emerge-hack
 
 [diff]
        renames = copies
+       renameLimit = 1024
+       wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
 
 [diff "lisp"]
-       xfuncname = "^\\s*\\(def.*$"
+       xfuncname = "^((\\(|\\s*\\(def).*$)"
 
 [log]
        date = rfc
        decorate = true
+       follow = true
+       mailmap = true
 
 [rebase]
        autosquash = true
 
+[push]
+       default = matching
+       followTags = true
+
 [format]
        headers = "Organization: Straylight/Edgeware\n"
 
@@ -45,10 +59,10 @@
        whitespace = reverse red
 
 [color "interactive"]
-        prompt = bold yellow
-        header = bold
-        help = green
-        error = bold red
+       prompt = bold yellow
+       header = bold
+       help = green
+       error = bold red
 
 [color "status"]
        header = bold
@@ -64,6 +78,11 @@
 [color "grep"]
        external = --color=always
 
+[pager]
+       log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+       show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+       diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+
 [alias]
        egrep = "grep -E"
        patch = "format-patch -o p -s"
@@ -97,6 +116,7 @@
 
 [rerere]
        enabled = yes
+       autoupdate = yes
 
 [stgit]
        autoresolved = yes
@@ -116,4 +136,7 @@
 
 [gui]
        fontui = -family Sans -size 10
-       fontdiff = -family MiscFixed6x13 -size 10
+       fontdiff = -family Fixed -size 13
+
+[http]
+       cookiefile = @home@/.gitcookies