X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/75d08fb2927277b8bf407e74e1dcbb42d1a1d038..ea09c6cb7ff01f29a7e8ed5afdf67b9ec5376012:/gitconfig

diff --git a/gitconfig b/gitconfig
index 9be32a3..1f90ebf 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,12 +1,18 @@
 [core]
 	filemode = true
+	excludesfile = @gitignore@
 
 [user]
 	name = Mark Wooding
 	email = mdw@distorted.org.uk
+	signingkey = @releasekey@
 
 [merge]
 	summary = true
+	tool = emerge
+
+[mergetool "emerge"]
+	path = emerge-hack
 
 [diff]
 	renames = copies
@@ -22,8 +28,8 @@
 [color "diff"]
 	plain = normal
 	meta = bold
-	new = bold green
-	old = bold red
+	new = green
+	old = red
 	commit = bold yellow
 	whitespace = reverse red
 
@@ -41,11 +47,20 @@
 [alias]
 	egrep = "grep -E"
 	patch = "format-patch -o p -s"
+	release = !"sh -e -c ' \
+		[ $# -gt 0 ] || { \
+		  echo >&2 \"usage: git release [OPTS] TAG\"; \
+		  exit 1; \
+		}; \
+		ver=$(eval echo \"\\$$#\"); \
+		git tag -as -m \"Release $ver.\" \"$@\"' release"
+	amend = !"env EDITOR=true VISUAL=true git commit --amend -a"
 	mailto = "send-email \
 			--quiet \
 			--no-chain-reply-to \
 			--no-signed-off-by-cc \
 			--to"
+	files = "ls-files --exclude-standard"
 
 [stgit]
 	autoresolved = yes
@@ -54,3 +69,11 @@
 [mail "alias"]
 	git = git@vger.kernel.org
 	mdw = mdw@distorted.org.uk
+
+[sendemail]
+	chainreplyto = no
+	signedoffcc = yes
+
+[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