X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-format-patch.sh;h=d3979d76318a19746b02c3efcba1212de2fcce20;hb=075dd8ee5417899c9f41b90f0dceecdf85433468;hp=01508e3b04f91bba3e960eb74eaff3e349e209bd;hpb=1ed91937e5cd59fdbdfa5f15f6fac132d2b21ce0;p=git.git

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 01508e3b..d3979d76 100755
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -9,8 +9,10 @@ one file per patch, for e-mail submission.  Each output file is
 numbered sequentially from 1, and uses the first line of the commit
 message (massaged for pathname safety) as the filename.
 
-When -o is specified, output files are created in that directory; otherwise in
-the current working directory.
+There are three output modes.  By default, output files are created in
+the current working directory; when -o is specified, they are created
+in that directory instead; when --stdout is specified, they are spit
+on standard output, and can be piped to git-am.
 
 When -n is specified, instead of "[PATCH] Subject", the first line is formatted
 as "[PATCH N/M] Subject", unless you have only one patch.
@@ -173,6 +175,7 @@ titleScript='
 
 whosepatchScript='
 /^author /{
+	s/'\''/'\''\\'\'\''/g
 	s/author \(.*>\) \(.*\)$/au='\''\1'\'' ad='\''\2'\''/p
 	q
 }'
@@ -210,6 +213,8 @@ Date: '"$ad"
 	}
 
 	mailScript="$mailScript"'
+	a\
+
 	: body
 	p
 	n