From: Junio C Hamano <junio@hera.kernel.org>
Date: Sun, 2 Sep 2007 06:25:18 +0000 (+0000)
Subject: Autogenerated manpages for v1.5.3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=968249e825f31958ae3381bddac7ba4a6d3379ef;p=git.git

Autogenerated manpages for v1.5.3
---

diff --git a/man1/git-rebase.1 b/man1/git-rebase.1
index b9cb6ba7b..8239d173f 100644
--- a/man1/git-rebase.1
+++ b/man1/git-rebase.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REBASE" "1" "09/01/2007" "Git 1.5.3.rc7.30.g947ad2" "Git Manual"
+.TH "GIT\-REBASE" "1" "09/02/2007" "Git 1.5.3" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -12,7 +12,7 @@ git\-rebase \- Forward\-port local commits to the updated upstream head
 .SH "SYNOPSIS"
 .sp
 .nf
-\fIgit\-rebase\fR [\-i | \-\-interactive] [\-v | \-\-verbose] [\-\-merge] [\-C<n>]
+\fIgit\-rebase\fR [\-i | \-\-interactive] [\-v | \-\-verbose] [\-m | \-\-merge] [\-C<n>]
         [\-p | \-\-preserve\-merges] [\-\-onto <newbase>] <upstream> [<branch>]
 \fIgit\-rebase\fR \-\-continue | \-\-skip | \-\-abort
 .fi
@@ -175,7 +175,7 @@ Restore the original branch and abort the rebase operation.
 \-\-skip
 Restart the rebasing process by skipping the current patch.
 .TP
-\-\-merge
+\-m, \-\-merge
 Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side.
 .TP
 \-s <strategy>, \-\-strategy=<strategy>
diff --git a/man1/git-send-email.1 b/man1/git-send-email.1
index 3881ced77..6d8a49d7a 100644
--- a/man1/git-send-email.1
+++ b/man1/git-send-email.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-SEND\-EMAIL" "1" "08/21/2007" "Git 1.5.3.rc5.46.g23d5" "Git Manual"
+.TH "GIT\-SEND\-EMAIL" "1" "09/02/2007" "Git 1.5.3" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -28,6 +28,9 @@ Specify a starting "Cc:" value for each email.
 
 The \-\-cc option must be repeated for each user you want on the cc list.
 .TP
+\-\-cc\-cmd
+Specify a command to execute once per patch file which should generate patch file specific "Cc:" entries. Output of this command must be single email address per line. Default is the value of \fIsendemail.cccmd\fR configuration value.
+.TP
 \-\-chain\-reply\-to, \-\-no\-chain\-reply\-to
 If this is set, each email will be sent as a reply to the previous email sent. If disabled with "\-\-no\-chain\-reply\-to", all emails after the first will be sent as replies to the first email sent. When using this, it is recommended that the first file given be an overview of the entire patch series. Default is the value of the \fIsendemail.chainreplyto\fR configuration value; if that is unspecified, default to \-\-chain\-reply\-to.
 .TP
@@ -76,6 +79,9 @@ To avoid typing long email addresses, point this to one or more email aliases fi
 sendemail.aliasfiletype
 Format of the file(s) specified in sendemail.aliasesfile. Must be one of \fImutt\fR, \fImailrc\fR, \fIpine\fR, or \fIgnus\fR.
 .TP
+sendemail.cccmd
+Command to execute to generate per patch file specific "Cc:"s.
+.TP
 sendemail.bcc
 Email address (or alias) to always bcc.
 .TP