From 9ca6d19073b277a53a08e45c7168023d3ebec895 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 9 Sep 2019 18:25:56 +0100
Subject: [PATCH] dot/gitconfig.in: Force the `from' address on Git patches.

I don't think it's right to sign other people up for email just because
I'm presenting their patches upstream.
---
 Makefile         | 3 ++-
 dot/gitconfig.in | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 85978dd..b6b5774 100644
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,8 @@ DOTSUBST		+= .gitconfig
 SCRIPTLINKS		+= git-copyright-dates
 DOTLINKS		+= .cgrc .tigrc
 .gitconfig_SUBSTS	 = \
-	$(call substvar,releasekey,$(call mdw-conf,releasekey,481334C2))
+	$(call substvar,releasekey,$(call mdw-conf,releasekey,481334C2)) \
+	$(call substvar,email,$(call mdw-conf,email,mdw@distorted.org.uk))
 $(HOME)/.gitconfig: $(HOME)/.mdw.conf
 
 ## PulseAudio.
diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index c024465..0ce73d3 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -46,9 +46,11 @@
 
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
+	from = Mark Wooding <@email@>
 	coverletter = auto
 	thread = shallow
 	signature = "[mdw]"
+	outputdirectory = p/
 
 [color]
 	ui = auto
-- 
2.11.0