From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Mar 2009 21:01:24 +0000 (-0700)
Subject: Merge branch 'js/maint-send-email' into maint
X-Git-Tag: v1.6.2.1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7681ed2d2e4ac54bf7d25526d4d130af617d054a?ds=inline;hp=-c

Merge branch 'js/maint-send-email' into maint

* js/maint-send-email:
send-email: don't create temporary compose file until it is needed
send-email: --suppress-cc improvements
send-email: handle multiple Cc addresses when reading mbox message
send-email: allow send-email to run outside a repo
---

7681ed2d2e4ac54bf7d25526d4d130af617d054a
diff --combined Documentation/git-send-email.txt
index 66bf3b2fcd,164d149ea3..fc0a4ab441
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@@ -19,19 -19,6 +19,19 @@@ The header of the email is configurabl
  specified on the command line, the user will be prompted with a ReadLine
  enabled interface to provide the necessary information.
  
 +There are two formats accepted for patch files:
 +
 +1. mbox format files
 ++
 +This is what linkgit:git-format-patch[1] generates.  Most headers and MIME
 +formatting are ignored.
 +
 +2. The original format used by Greg Kroah-Hartman's 'send_lots_of_email.pl'
 +script
 ++
 +This format expects the first line of the file to contain the "Cc:" value
 +and the "Subject:" of the message as the second line.
 +
  
  OPTIONS
  -------
@@@ -177,14 -164,25 +177,25 @@@ Automatin
  
  --suppress-cc::
  	Specify an additional category of recipients to suppress the
- 	auto-cc of.  'self' will avoid including the sender, 'author' will
- 	avoid including the patch author, 'cc' will avoid including anyone
- 	mentioned in Cc lines in the patch, 'sob' will avoid including
- 	anyone mentioned in Signed-off-by lines, and 'cccmd' will avoid
- 	running the --cc-cmd.  'all' will suppress all auto cc values.
- 	Default is the value of 'sendemail.suppresscc' configuration value;
- 	if that is unspecified, default to 'self' if --suppress-from is
- 	specified, as well as 'sob' if --no-signed-off-cc is specified.
+ 	auto-cc of:
+ +
+ --
+ - 'author' will avoid including the patch author
+ - 'self' will avoid including the sender
+ - 'cc' will avoid including anyone mentioned in Cc lines in the patch header
+   except for self (use 'self' for that).
+ - 'ccbody' will avoid including anyone mentioned in Cc lines in the
+   patch body (commit message) except for self (use 'self' for that).
+ - 'sob' will avoid including anyone mentioned in Signed-off-by lines except
+    for self (use 'self' for that).
+ - 'cccmd' will avoid running the --cc-cmd.
+ - 'body' is equivalent to 'sob' + 'ccbody'
+ - 'all' will suppress all auto cc values.
+ --
+ +
+ Default is the value of 'sendemail.suppresscc' configuration value; if
+ that is unspecified, default to 'self' if --suppress-from is
+ specified, as well as 'body' if --no-signed-off-cc is specified.
  
  --[no-]suppress-from::
  	If this is set, do not add the From: address to the cc: list.