@matheusbsbs / matheus-bagliano / commits / 432b128220
Fork 0

Docs: send-email: Put options back into alphabetical order

Signed-off-by: Michael Witten <mfwitten@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Michael Witten committed Apr 13, 2009 at 13:23 UTC 432b128220e8665d361345117201b34fe2fccba8
1 file changed +11 -11
Documentation/git-send-email.txt
+11 -11
@@ -39,6 +39,11 @@ OPTIONS
39 Composing
40 ~~~~~~~~~
41
42 +--annotate::
43 + Review each patch you're about to send in an editor. The setting
44 + 'sendemail.multiedit' defines if this will spawn one editor per patch
45 + or one for all of them at once.
46 +
47 --bcc=<address>::
48 Specify a "Bcc:" value for each email. Default is the value of
49 'sendemail.bcc'.
@@ -51,11 +56,6 @@ The --bcc option must be repeated for each user you want on the bcc list.
56 +
57 The --cc option must be repeated for each user you want on the cc list.
58
54 ---annotate::
55 - Review each patch you're about to send in an editor. The setting
56 - 'sendemail.multiedit' defines if this will spawn one editor per patch
57 - or one for all of them at once.
58 -
59 --compose::
60 Use $GIT_EDITOR, core.editor, $VISUAL, or $EDITOR to edit an
61 introductory message for the patch series.
@@ -230,6 +230,12 @@ have been specified, in which case default to 'compose'.
230 --dry-run::
231 Do everything except actually send the emails.
232
233 +--[no-]format-patch::
234 + When an argument may be understood either as a reference or as a file name,
235 + choose to understand it as a format-patch argument ('--format-patch')
236 + or as a file name ('--no-format-patch'). By default, when such a conflict
237 + occurs, git send-email will fail.
238 +
239 --quiet::
240 Make git-send-email less verbose. One line per email should be
241 all that is output.
@@ -246,12 +252,6 @@ have been specified, in which case default to 'compose'.
252 Default is the value of 'sendemail.validate'; if this is not set,
253 default to '--validate'.
254
249 ---[no-]format-patch::
250 - When an argument may be understood either as a reference or as a file name,
251 - choose to understand it as a format-patch argument ('--format-patch')
252 - or as a file name ('--no-format-patch'). By default, when such a conflict
253 - occurs, git send-email will fail.
254 -
255
256 CONFIGURATION
257 -------------