From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 24 Sep 2007 07:37:32 +0000 (+0000)
Subject: Autogenerated manpages for v1.5.3.2-99-ge4b2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70f40cdf73aeac0c9b0e6fa4477b2aff8c0f279e;p=git.git

Autogenerated manpages for v1.5.3.2-99-ge4b2
---

diff --git a/man1/git-apply.1 b/man1/git-apply.1
index 4c7557f58..c38f889be 100644
--- a/man1/git-apply.1
+++ b/man1/git-apply.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\-APPLY" "1" "08/16/2007" "Git 1.5.3.rc5.11.g312e" "Git Manual"
+.TH "GIT\-APPLY" "1" "09/24/2007" "Git 1.5.3.2.99.ge4b2" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -13,7 +13,7 @@ git\-apply \- Apply a patch on a git index file and a working tree
 .sp
 .nf
 \fIgit\-apply\fR [\-\-stat] [\-\-numstat] [\-\-summary] [\-\-check] [\-\-index]
-          [\-\-apply] [\-\-no\-add] [\-\-index\-info] [\-R | \-\-reverse]
+          [\-\-apply] [\-\-no\-add] [\-\-build\-fake\-ancestor <file>] [\-R | \-\-reverse]
           [\-\-allow\-binary\-replacement | \-\-binary] [\-\-reject] [\-z]
           [\-pNUM] [\-CNUM] [\-\-inaccurate\-eof] [\-\-cached]
           [\-\-whitespace=<nowarn|warn|error|error\-all|strip>]
@@ -44,8 +44,10 @@ When \-\-check is in effect, or when applying the patch (which is the default wh
 \-\-cached
 Apply a patch without touching the working tree. Instead, take the cached data, apply the patch, and store the result in the index, without using the working tree. This implies \fI\-\-index\fR.
 .TP
-\-\-index\-info
-Newer git\-diff output has embedded \fIindex information\fR for each blob to help identify the original version that the patch applies to. When this flag is given, and if the original version of the blob is available locally, outputs information about them to the standard output.
+\-\-build\-fake\-ancestor <file>
+Newer git\-diff output has embedded \fIindex information\fR for each blob to help identify the original version that the patch applies to. When this flag is given, and if the original versions of the blobs is available locally, builds a temporary index containing those blobs.
+
+When a pure mode change is encountered (which has no index information), the information is read from the current index instead.
 .TP
 \-R, \-\-reverse
 Apply the patch in reverse.