send-email: make annotate configurable

Some people always do --annotate, lets not force them to always type
that.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-04-07 01:10:27 -06:00 committed by Junio C Hamano
parent 21ccebec0d
commit 402596aafa
3 changed files with 8 additions and 5 deletions

View File

@ -1998,6 +1998,7 @@ sendemail.<identity>.*::
sendemail.aliasesfile:: sendemail.aliasesfile::
sendemail.aliasfiletype:: sendemail.aliasfiletype::
sendemail.annotate::
sendemail.bcc:: sendemail.bcc::
sendemail.cc:: sendemail.cc::
sendemail.cccmd:: sendemail.cccmd::

View File

@ -45,8 +45,9 @@ Composing
~~~~~~~~~ ~~~~~~~~~
--annotate:: --annotate::
Review and edit each patch you're about to send. See the Review and edit each patch you're about to send. Default is the value
CONFIGURATION section for 'sendemail.multiedit'. of 'sendemail.annotate'. See the CONFIGURATION section for
'sendemail.multiedit'.
--bcc=<address>:: --bcc=<address>::
Specify a "Bcc:" value for each email. Default is the value of Specify a "Bcc:" value for each email. Default is the value of

View File

@ -54,7 +54,7 @@ git send-email [options] <file | directory | rev-list options >
--[no-]bcc <str> * Email Bcc: --[no-]bcc <str> * Email Bcc:
--subject <str> * Email "Subject:" --subject <str> * Email "Subject:"
--in-reply-to <str> * Email "In-Reply-To:" --in-reply-to <str> * Email "In-Reply-To:"
--annotate * Review each patch that will be sent in an editor. --[no-]annotate * Review each patch that will be sent in an editor.
--compose * Open an editor for introduction. --compose * Open an editor for introduction.
--compose-encoding <str> * Encoding to assume for introduction. --compose-encoding <str> * Encoding to assume for introduction.
--8bit-encoding <str> * Encoding to assume 8bit mails if undeclared --8bit-encoding <str> * Encoding to assume 8bit mails if undeclared
@ -212,7 +212,8 @@ my %config_bool_settings = (
"signedoffbycc" => [\$signed_off_by_cc, undef], "signedoffbycc" => [\$signed_off_by_cc, undef],
"signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated "signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated
"validate" => [\$validate, 1], "validate" => [\$validate, 1],
"multiedit" => [\$multiedit, undef] "multiedit" => [\$multiedit, undef],
"annotate" => [\$annotate, undef]
); );
my %config_settings = ( my %config_settings = (
@ -304,7 +305,7 @@ my $rc = GetOptions("h" => \$help,
"smtp-debug:i" => \$debug_net_smtp, "smtp-debug:i" => \$debug_net_smtp,
"smtp-domain:s" => \$smtp_domain, "smtp-domain:s" => \$smtp_domain,
"identity=s" => \$identity, "identity=s" => \$identity,
"annotate" => \$annotate, "annotate!" => \$annotate,
"compose" => \$compose, "compose" => \$compose,
"quiet" => \$quiet, "quiet" => \$quiet,
"cc-cmd=s" => \$cc_cmd, "cc-cmd=s" => \$cc_cmd,