From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 10 Sep 2007 01:33:30 +0000 (+0000)
Subject: Autogenerated manpages for v1.5.3.1-27-g57543
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=12b9faa54e3fa77eee6b1d1e439bde25e69a5930;p=git.git

Autogenerated manpages for v1.5.3.1-27-g57543
---

diff --git a/man1/git-clone.1 b/man1/git-clone.1
index c68fa7a44..ba711fd59 100644
--- a/man1/git-clone.1
+++ b/man1/git-clone.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\-CLONE" "1" "09/01/2007" "Git 1.5.3.rc7.30.g947ad2" "Git Manual"
+.TH "GIT\-CLONE" "1" "09/10/2007" "Git 1.5.3.1.27.g57543" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -35,7 +35,7 @@ Optimize the cloning process from a repository on a local filesystem by copying
 When the repository to clone is on the local machine, instead of using hard links, automatically setup .git/objects/info/alternates to share the objects with the source repository. The resulting repository starts out without any object of its own.
 .TP
 \-\-reference <repository>
-If the reference repository is on the local machine automatically setup .git/objects/info/alternates to obtain objects from the reference repository. Using an already existing repository as an alternate will require less objects to be copied from the repository being cloned, reducing network and local storage costs.
+If the reference repository is on the local machine automatically setup .git/objects/info/alternates to obtain objects from the reference repository. Using an already existing repository as an alternate will require fewer objects to be copied from the repository being cloned, reducing network and local storage costs.
 .TP
 \-\-quiet , \-q
 Operate quietly. This flag is passed to "rsync" and "git\-fetch\-pack" commands when given.
diff --git a/man1/git-rebase.1 b/man1/git-rebase.1
index 8239d173f..01829dc27 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/02/2007" "Git 1.5.3" "Git Manual"
+.TH "GIT\-REBASE" "1" "09/10/2007" "Git 1.5.3.1.27.g57543" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -12,8 +12,9 @@ git\-rebase \- Forward\-port local commits to the updated upstream head
 .SH "SYNOPSIS"
 .sp
 .nf
-\fIgit\-rebase\fR [\-i | \-\-interactive] [\-v | \-\-verbose] [\-m | \-\-merge] [\-C<n>]
-        [\-p | \-\-preserve\-merges] [\-\-onto <newbase>] <upstream> [<branch>]
+\fIgit\-rebase\fR [\-i | \-\-interactive] [\-v | \-\-verbose] [\-m | \-\-merge]
+        [\-C<n>] [ \-\-whitespace=<option>] [\-p | \-\-preserve\-merges]
+        [\-\-onto <newbase>] <upstream> [<branch>]
 \fIgit\-rebase\fR \-\-continue | \-\-skip | \-\-abort
 .fi
 .SH "DESCRIPTION"
@@ -187,6 +188,9 @@ Display a diffstat of what changed upstream since the last rebase.
 \-C<n>
 Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored.
 .TP
+\-\-whitespace=<nowarn|warn|error|error\-all|strip>
+This flag is passed to the git\-apply program (see \fBgit\-apply\fR(1)) that applies the patch.
+.TP
 \-i, \-\-interactive
 Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below).
 .TP