X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/73165cde4740aae25bcbe379c8f3ad2e6d3d8d5f..20f18905c318521d93fd81875e707309d1206762:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index f39a5fa..e53b153 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -19,19 +19,23 @@
 
 [diff]
 	renames = copies
+	wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
 
 [diff "lisp"]
 	xfuncname = "^\\s*\\(def.*$"
 
+[log]
+	date = rfc
+	decorate = true
+
+[rebase]
+	autosquash = true
+
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
 
 [color]
-	diff = auto
-	status = auto
-	branch = auto
-	interactive = auto
-	grep = auto
+	ui = auto
 
 [color "diff"]
 	plain = normal
@@ -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
@@ -64,6 +68,7 @@
 [alias]
 	egrep = "grep -E"
 	patch = "format-patch -o p -s"
+	graph = "log --pretty=oneline --abbrev-commit --graph"
 	release = !"sh -e -c ' \
 		[ $# -gt 0 ] || { \
 		  echo >&2 \"usage: git release TAG [OPTS]\"; \
@@ -93,6 +98,7 @@
 
 [rerere]
 	enabled = yes
+	autoupdate = yes
 
 [stgit]
 	autoresolved = yes