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>
Felipe Contreras committed
Apr 7, 2013 at 01:10 UTC
402596aafa45ef371611bb795bdf8daa2bdb9286
3 files changed
+8
-5
Documentation/config.txt
+1
@@ -1998,6 +1998,7 @@ sendemail.<identity>.*::
1998
1999
sendemail.aliasesfile::
2000
sendemail.aliasfiletype::
2001
+sendemail.annotate::
2002
sendemail.bcc::
2003
sendemail.cc::
2004
sendemail.cccmd::
Documentation/git-send-email.txt
+3
-2
@@ -45,8 +45,9 @@ Composing
45
~~~~~~~~~
46
47
--annotate::
48
- Review and edit each patch you're about to send. See the
49
- CONFIGURATION section for 'sendemail.multiedit'.
48
+ Review and edit each patch you're about to send. Default is the value
49
+ of 'sendemail.annotate'. See the CONFIGURATION section for
50
+ 'sendemail.multiedit'.
51
52
--bcc=<address>::
53
Specify a "Bcc:" value for each email. Default is the value of
git-send-email.perl
+4
-3
@@ -54,7 +54,7 @@ git send-email [options] <file | directory | rev-list options >
54
--[no-]bcc <str> * Email Bcc:
55
--subject <str> * Email "Subject:"
56
--in-reply-to <str> * Email "In-Reply-To:"
57
- --annotate * Review each patch that will be sent in an editor.
57
+ --[no-]annotate * Review each patch that will be sent in an editor.
58
--compose * Open an editor for introduction.
59
--compose-encoding <str> * Encoding to assume for introduction.
60
--8bit-encoding <str> * Encoding to assume 8bit mails if undeclared
@@ -212,7 +212,8 @@ my %config_bool_settings = (
212
"signedoffbycc" => [\$signed_off_by_cc, undef],
213
"signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated
214
"validate" => [\$validate, 1],
215
- "multiedit" => [\$multiedit, undef]
215
+ "multiedit" => [\$multiedit, undef],
216
+ "annotate" => [\$annotate, undef]
217
);
218
219
my %config_settings = (
@@ -304,7 +305,7 @@ my $rc = GetOptions("h" => \$help,
305
"smtp-debug:i" => \$debug_net_smtp,
306
"smtp-domain:s" => \$smtp_domain,
307
"identity=s" => \$identity,
307
- "annotate" => \$annotate,
308
+ "annotate!" => \$annotate,
309
"compose" => \$compose,
310
"quiet" => \$quiet,
311
"cc-cmd=s" => \$cc_cmd,