From: Junio C Hamano Date: Fri, 12 Jun 2009 06:35:46 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.6.4-rc0~70 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b8364903c3e4cde713102e4a36d3926b020b0f70?ds=inline;hp=-c Merge branch 'maint' * maint: Documentation: git-send-mail can take rev-list arg to drive format-patch rebase--interactive: remote stray closing parenthesis --- b8364903c3e4cde713102e4a36d3926b020b0f70 diff --combined Documentation/git-send-email.txt index 7c5ce415c7,a2821907c7..e7cb0e6c71 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@@ -14,6 -14,10 +14,10 @@@ SYNOPSI DESCRIPTION ----------- Takes the patches given on the command line and emails them out. + Patches can be specified as files, directories (which will send all + files in the directory), or directly as a revision list. In the + last case, any format accepted by linkgit:git-format-patch[1] can + be passed to git send-email. The header of the email is configurable by command line options. If not specified on the command line, the user will be prompted with a ReadLine @@@ -39,10 -43,6 +43,10 @@@ OPTION Composing ~~~~~~~~~ +--annotate:: + Review and edit each patch you're about to send. See the + CONFIGURATION section for 'sendemail.multiedit'. + --bcc=
:: Specify a "Bcc:" value for each email. Default is the value of 'sendemail.bcc'. @@@ -55,6 -55,11 +59,6 @@@ The --bcc option must be repeated for e + The --cc option must be repeated for each user you want on the cc list. ---annotate:: - Review each patch you're about to send in an editor. The setting - 'sendemail.multiedit' defines if this will spawn one editor per patch - or one for all of them at once. - --compose:: Use $GIT_EDITOR, core.editor, $VISUAL, or $EDITOR to edit an introductory message for the patch series. @@@ -66,16 -71,11 +70,16 @@@ In-Reply-To headers specified in the me and In-Reply-To headers will be used unless they are removed. + Missing From or In-Reply-To headers will be prompted for. ++ +See the CONFIGURATION section for 'sendemail.multiedit'. --from=
:: - Specify the sender of the emails. This will default to - the value GIT_COMMITTER_IDENT, as returned by "git var -l". - The user will still be prompted to confirm this entry. + Specify the sender of the emails. If not specified on the command line, + the value of the 'sendemail.from' configuration option is used. If + neither the command line option nor 'sendemail.from' are set, then the + user will be prompted for the value. The default for the prompt will be + the value of GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not + set, as returned by "git var -l". --in-reply-to=:: Specify the contents of the first In-Reply-To header. @@@ -139,9 -139,7 +143,9 @@@ user is prompted for a password while t --smtp-server-port=:: Specifies a port different from the default port (SMTP servers typically listen to smtp port 25 and ssmtp port - 465). This can be set with 'sendemail.smtpserverport'. + 465); symbolic port names (e.g. "submission" instead of 465) + are also accepted. The port can also be set with the + 'sendemail.smtpserverport' configuration variable. --smtp-ssl:: Legacy alias for '--smtp-encryption ssl'. @@@ -236,12 -234,6 +240,12 @@@ have been specified, in which case defa --dry-run:: Do everything except actually send the emails. +--[no-]format-patch:: + When an argument may be understood either as a reference or as a file name, + choose to understand it as a format-patch argument ('--format-patch') + or as a file name ('--no-format-patch'). By default, when such a conflict + occurs, git send-email will fail. + --quiet:: Make git-send-email less verbose. One line per email should be all that is output. @@@ -258,6 -250,12 +262,6 @@@ Default is the value of 'sendemail.validate'; if this is not set, default to '--validate'. ---[no-]format-patch:: - When an argument may be understood either as a reference or as a file name, - choose to understand it as a format-patch argument ('--format-patch') - or as a file name ('--no-format-patch'). By default, when such a conflict - occurs, git send-email will fail. - CONFIGURATION -------------