X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/7e2c05e92fcc878bd17c49575bede378db3c45a3..93ba996def65bdebd7d7026caff9661d9b038ead:/gitconfig

diff --git a/gitconfig b/gitconfig
index 7ef9adf..d74e60b 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,10 +1,11 @@
 [core]
 	filemode = true
+	excludesfile = @gitignore@
 
 [user]
 	name = Mark Wooding
 	email = mdw@distorted.org.uk
-	signingkey = 0x838424481371BE1B22ECB4C545510A46481334C2
+	signingkey = @releasekey@
 
 [merge]
 	summary = true
@@ -27,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
 
@@ -47,14 +48,19 @@
 	egrep = "grep -E"
 	patch = "format-patch -o p -s"
 	release = !"sh -e -c ' \
-		ver=${1?version}; \
-		shift; \
-		git tag -as "$@" -m \"Release $ver.\" \"$ver\"' release"
+		[ $# -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
@@ -64,6 +70,10 @@
 	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
+	fontui = -family Sans -size 10
+	fontdiff = -family MiscFixed6x13 -size 10