From: Junio C Hamano Date: Sun, 31 May 2009 23:16:52 +0000 (-0700) Subject: Merge branch 'mw/send-email' X-Git-Tag: v1.6.4-rc0~101 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06676213d206b7e1eb8f2eea16cca7239a5e0edc;p=git.git 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 --- 06676213d206b7e1eb8f2eea16cca7239a5e0edc diff --cc Documentation/git-send-email.txt index f94077027,f7e428eb5..7c5ce415c --- a/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=
:: - 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=:: Specify the contents of the first In-Reply-To header.