Felipe Contreras <felipe.contreras@xxxxxxxxx> writes:
> Some people always do --annotate, lets not force them to always type
> that.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
> ---
Sounds sensible; any tests to protect this from later breakages?
> Documentation/config.txt | 1 +
> Documentation/git-send-email.txt | 5 +++--
> git-send-email.perl | 7 ++++---
> 3 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index bbba728..c8e2178 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1994,6 +1994,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 44a1f7c..2facc18 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 be809e5..e187b12 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,
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html