X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/e818009e09e211cfa1f5778b112fa9715a5c85d8..56c3a7e735236be7ff43f95fe1a001f5245cdd81:/gitconfig

diff --git a/gitconfig b/gitconfig
index d898e71..4d8eb77 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,14 +1,64 @@
+[core]
+	filemode = true
+
 [user]
 	name = Mark Wooding
-	email = <mdw@distorted.org.uk>
+	email = mdw@distorted.org.uk
 
 [merge]
 	summary = true
+	tool = emerge
+
+[mergetool "emerge"]
+	path = emerge-hack
 
 [diff]
 	renames = copies
 
+[format]
+	headers = "Organization: Straylight/Edgeware\n"
+
 [color]
 	diff = auto
 	status = auto
 	branch = auto
+
+[color "diff"]
+	plain = normal
+	meta = bold
+	new = bold green
+	old = bold red
+	commit = bold yellow
+	whitespace = reverse red
+
+[color "status"]
+	header = bold
+	added = bold green
+	changed = bold blue
+	untracked = bold red
+
+[color "branch"]
+	current = bold
+	local = normal
+	remote = cyan
+
+[alias]
+	egrep = "grep -E"
+	patch = "format-patch -o p -s"
+	mailto = "send-email \
+			--quiet \
+			--no-chain-reply-to \
+			--no-signed-off-by-cc \
+			--to"
+
+[stgit]
+	autoresolved = yes
+	smtpdelay = 0
+
+[mail "alias"]
+	git = git@vger.kernel.org
+	mdw = mdw@distorted.org.uk
+
+[gui]
+	fontui = -family helvetica -size 11 -weight normal -slant roman -underline 0 -overstrike 0
+	fontdiff = -family fixed -size 10 -weight normal -slant roman -underline 0 -overstrike 0