Merge branch 'js/send-email'

* js/send-email:
send-email: add --confirm option and configuration setting
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

diff --combined Documentation/git-send-email.txt
index 66bf3b2fcdccda9cb29d66756b3c20e5a1545d46,0335727012ed7c3cd7467840b0483be2bddc6a8f..14dfb501eb2e34523cd3c1e5e11149a07bac3f46
--- 1/Documentation/git-send-email.txt
--- 2/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.
@@@ -201,6 -199,22 +212,22 @@@
  Administering
  ~~~~~~~~~~~~~
  
+ --confirm::
+       Confirm just before sending:
+ +
+ --
+ - 'always' will always confirm before sending
+ - 'never' will never confirm before sending
+ - 'cc' will confirm before sending when send-email has automatically
+   added addresses from the patch to the Cc list
+ - 'compose' will confirm before sending the first message when using --compose.
+ - 'auto' is equivalent to 'cc' + 'compose'
+ --
+ +
+ Default is the value of 'sendemail.confirm' configuration value; if that
+ is unspecified, default to 'auto' unless any of the suppress options
+ have been specified, in which case default to 'compose'.
+ 
  --dry-run::
        Do everything except actually send the emails.
  
@@@ -244,6 -258,11 +271,11 @@@ sendemail.multiedit:
        summary when '--compose' is used). If false, files will be edited one
        after the other, spawning a new editor each time.
  
+ sendemail.confirm::
+       Sets the default for whether to confirm before sending. Must be
+       one of 'always', 'never', 'cc', 'compose', or 'auto'. See '--confirm'
+       in the previous section for the meaning of these values.
+ 
  
  Author
  ------