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

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 78672d1..2bbe464 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -4,28 +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
+	follow = true
+	mailmap = true
+
+[rebase]
+	autosquash = true
+
+[push]
+	default = matching
+	followTags = true
 
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
@@ -42,10 +59,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
@@ -61,6 +78,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"
@@ -94,6 +116,7 @@
 
 [rerere]
 	enabled = yes
+	autoupdate = yes
 
 [stgit]
 	autoresolved = yes
@@ -113,4 +136,7 @@
 
 [gui]
 	fontui = -family Sans -size 10
-	fontdiff = -family MiscFixed6x13 -size 10
+	fontdiff = -family Fixed -size 13
+
+[http]
+	cookiefile = @home@/.gitcookies