summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-04-07 01:10:27 -0600
committerJunio C Hamano <gitster@pobox.com>2013-04-07 00:42:29 -0700
commit402596aafa45ef371611bb795bdf8daa2bdb9286 (patch)
tree1a65f6da62f4bee96f2dad8af6597a75bed48dde /Documentation
parent21ccebec0dd1d7e624ea2f22af6ac93686daf34f (diff)
downloadgit-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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt1
-rw-r--r--Documentation/git-send-email.txt5
2 files changed, 4 insertions, 2 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