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.

diff --git a/Makefile b/Makefile
index 85978ddb6140c2d65a90e882fd99d7af392e8e02..b6b577432b0d2036eaafedf29c2ec423506c964a 100644 (file)
--- 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 c024465a8ecf56cd38d8da6c034115ec36e13936..0ce73d35bfb5949ae9fd17be5920f74a00b56beb 100644 (file)
--- 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