Merge remote-tracking branch 'staging/master'

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index c024465..9d95d2a 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
@@ -135,6 +137,9 @@
        signedoffbycc = yes
        suppresscc = self
 
+[mailinfo]
+       scissors = true
+
 [gui]
        fontui = -family Sans -size 10
        fontdiff = -family Fixed -size 13