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 106e2a9..47fa392 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -5,6 +5,7 @@
        filemode = true
        excludesfile = @profile@/git/gitignore
        attributesfile = @profile@/git/attributes
+       whitespace = trailing-space,space-before-tab,indent-with-non-tab
 
 [user]
        name = Mark Wooding
@@ -20,6 +21,7 @@
 
 [diff]
        renames = copies
+       renameLimit = 1024
        wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
 
 [diff "lisp"]