X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/518aede44529bc4c6218d52a3cf97a77888d3b2f..9cc4ff1354bdf73f44df3ba4cb699be92906b9fc:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 02a297d..4c0fa8a 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -4,32 +4,45 @@
 [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
 	email = mdw@distorted.org.uk
 	signingkey = @releasekey@
 
+[annex]
+	sshcaching = false
+
 [merge]
 	summary = true
 	tool = emerge
+	conflictStyle = diff3
 
 [mergetool "emerge"]
 	path = emerge-hack
 
 [diff]
 	renames = copies
+	renameLimit = 1024
+	wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
 
 [diff "lisp"]
-	xfuncname = "^\\s*\\(def.*$"
+	xfuncname = "^((\\(|\\s*\\(def).*$)"
 
 [log]
 	date = rfc
 	decorate = true
+	mailmap = true
 
 [rebase]
 	autosquash = true
 
+[push]
+	default = matching
+	followTags = true
+
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
 
@@ -45,10 +58,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 +77,11 @@
 [color "grep"]
 	external = --color=always
 
+[pager]
+	log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+	show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+	diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+
 [alias]
 	egrep = "grep -E"
 	patch = "format-patch -o p -s"
@@ -97,6 +115,7 @@
 
 [rerere]
 	enabled = yes
+	autoupdate = yes
 
 [stgit]
 	autoresolved = yes
@@ -116,4 +135,7 @@
 
 [gui]
 	fontui = -family Sans -size 10
-	fontdiff = -family MiscFixed6x13 -size 10
+	fontdiff = -family Fixed -size 13
+
+[http]
+	cookiefile = @home@/.gitcookies