X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/eff455a10e9f7ca9d3e14145e62adea14db92dc1..956286a32c692c0d42db6b2dbcfc00d645823327:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 106e2a9..1dbc92b 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -5,21 +5,27 @@
 	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"]
@@ -32,6 +38,10 @@
 [rebase]
 	autosquash = true
 
+[push]
+	default = matching
+	followTags = true
+
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
 
@@ -66,6 +76,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"
@@ -119,4 +134,7 @@
 
 [gui]
 	fontui = -family Sans -size 10
-	fontdiff = -family MiscFixed6x13 -size 10
+	fontdiff = -family Fixed -size 13
+
+[http]
+	cookiefile = @home@/.gitcookies