diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-04-07 01:10:27 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-07 00:42:29 -0700 |
| commit | 402596aafa45ef371611bb795bdf8daa2bdb9286 (patch) | |
| tree | 1a65f6da62f4bee96f2dad8af6597a75bed48dde | |
| parent | 21ccebec0dd1d7e624ea2f22af6ac93686daf34f (diff) | |
| download | git-402596aafa45ef371611bb795bdf8daa2bdb9286.tar.gz | |
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>
| -rw-r--r-- | Documentation/config.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-send-email.txt | 5 | ||||
| -rwxr-xr-x | git-send-email.perl | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index f79184c0a8..50840aab5e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1998,6 +1998,7 @@ sendemail.<identity>.*:: sendemail.aliasesfile:: sendemail.aliasfiletype:: +sendemail.annotate:: sendemail.bcc:: sendemail.cc:: sendemail.cccmd:: diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 0cffef8aa5..40a9a9abc1 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -45,8 +45,9 @@ Composing ~~~~~~~~~ --annotate:: - Review and edit each patch you're about to send. See the - CONFIGURATION section for 'sendemail.multiedit'. + Review and edit each patch you're about to send. Default is the value + of 'sendemail.annotate'. See the CONFIGURATION section for + 'sendemail.multiedit'. --bcc=<address>:: Specify a "Bcc:" value for each email. Default is the value of diff --git a/git-send-email.perl b/git-send-email.perl index 7297472818..bd13cc812d 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -54,7 +54,7 @@ git send-email [options] <file | directory | rev-list options > --[no-]bcc <str> * Email Bcc: --subject <str> * Email "Subject:" --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-encoding <str> * Encoding to assume for introduction. --8bit-encoding <str> * Encoding to assume 8bit mails if undeclared @@ -212,7 +212,8 @@ my %config_bool_settings = ( "signedoffbycc" => [\$signed_off_by_cc, undef], "signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated "validate" => [\$validate, 1], - "multiedit" => [\$multiedit, undef] + "multiedit" => [\$multiedit, undef], + "annotate" => [\$annotate, undef] ); my %config_settings = ( @@ -304,7 +305,7 @@ my $rc = GetOptions("h" => \$help, "smtp-debug:i" => \$debug_net_smtp, "smtp-domain:s" => \$smtp_domain, "identity=s" => \$identity, - "annotate" => \$annotate, + "annotate!" => \$annotate, "compose" => \$compose, "quiet" => \$quiet, "cc-cmd=s" => \$cc_cmd, |