X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/3b73ac920dbe0af1f7fcc344e1580b31411fa50c..bf674ae17bef5d279e96ca88770d4d3766185515:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 78672d1..e53b153 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -19,6 +19,7 @@
 
 [diff]
 	renames = copies
+	wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
 
 [diff "lisp"]
 	xfuncname = "^\\s*\\(def.*$"
@@ -27,6 +28,9 @@
 	date = rfc
 	decorate = true
 
+[rebase]
+	autosquash = true
+
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
 
@@ -42,10 +46,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 +98,7 @@
 
 [rerere]
 	enabled = yes
+	autoupdate = yes
 
 [stgit]
 	autoresolved = yes