Merge branch 'master' of http://git.distorted.org.uk/~mdw/profile

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 78672d1..47fa392 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -4,6 +4,8 @@
 [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
@@ -19,14 +21,19 @@
 
 [diff]
        renames = copies
+       renameLimit = 1024
+       wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
 
 [diff "lisp"]
-       xfuncname = "^\\s*\\(def.*$"
+       xfuncname = "^((\\(|\\s*\\(def).*$)"
 
 [log]
        date = rfc
        decorate = true
 
+[rebase]
+       autosquash = true
+
 [format]
        headers = "Organization: Straylight/Edgeware\n"
 
@@ -42,10 +49,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
@@ -94,6 +101,7 @@
 
 [rerere]
        enabled = yes
+       autoupdate = yes
 
 [stgit]
        autoresolved = yes