Merge branch 'mw/send-email'

* mw/send-email:
  send-email: Remove superfluous `my $editor = ...'
  send-email: 'References:' should only reference what is sent
  send-email: Handle "GIT:" rather than "GIT: " during --compose
  Docs: send-email: --smtp-server-port can take symbolic ports
  Docs: send-email: Refer to CONFIGURATION section for sendemail.multiedit
  Docs: send-email: Put options back into alphabetical order

diff --cc Documentation/git-send-email.txt
index f9407702794b0546f21844bafadb32b0c7984bd1,f7e428eb50292e2a186cd903fa4610f446c3890f..7c5ce415c7f27b4fb9b90ba65abf16158d36af82
--- 1/Documentation/git-send-email.txt
--- 2/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@@ -67,14 -66,13 +66,16 @@@ In-Reply-To headers specified in the me
  and In-Reply-To headers will be used unless they are removed.
  +
  Missing From or In-Reply-To headers will be prompted for.
+ +
+ See the CONFIGURATION section for 'sendemail.multiedit'.
  
  --from=<address>::
 -      Specify the sender of the emails.  This will default to
 -      the value GIT_COMMITTER_IDENT, as returned by "git var -l".
 -      The user will still be prompted to confirm this entry.
 +      Specify the sender of the emails.  If not specified on the command line,
 +      the value of the 'sendemail.from' configuration option is used.  If
 +      neither the command line option nor 'sendemail.from' are set, then the
 +      user will be prompted for the value.  The default for the prompt will be
 +      the value of GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not
 +      set, as returned by "git var -l".
  
  --in-reply-to=<identifier>::
        Specify the contents of the first In-Reply-To header.

diff --cc git-send-email.perl
Simple merge