X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/403dc17837643174f2ff25d1ae14a48ae37508c7..2351081f90923e4a56176caf8b35256ac5328658:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 7ef2432..77976f9 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -3,7 +3,7 @@
 
 [core]
 	filemode = true
-	excludesfile = @gitignore@
+	excludesfile = @profile@/git/gitignore
 
 [user]
 	name = Mark Wooding
@@ -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]\"; \
@@ -91,6 +96,9 @@
 		    sh -e; \
 		done' unstg"
 
+[rerere]
+	enabled = yes
+
 [stgit]
 	autoresolved = yes
 	smtpdelay = 0
@@ -100,8 +108,12 @@
 	mdw = mdw@distorted.org.uk
 
 [sendemail]
+	from = Mark Wooding <mdw@distorted.org.uk>
+	aliasesfile = @profile@/dot/mailrc
+	aliasfiletype = mailrc
 	chainreplyto = no
-	signedoffcc = yes
+	signedoffbycc = yes
+	suppresscc = self
 
 [gui]
 	fontui = -family Sans -size 10