summaryrefslogtreecommitdiffstats
path: root/git-apply.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-09-24 07:37:30 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-09-24 07:37:30 +0000
commit01d8f834b49b23198aaf6ab7d503b8e918876c7a (patch)
treeb27e641e954f306bb5afe67f56487c5c11c8a81b /git-apply.html
parent9810d63e3fcf38b02b3ccc9191b4807f7825982e (diff)
downloadgit-htmldocs-01d8f834b49b23198aaf6ab7d503b8e918876c7a.tar.gz
Autogenerated HTML docs for v1.5.3.2-99-ge4b2
Diffstat (limited to 'git-apply.html')
-rw-r--r--git-apply.html12
1 files changed, 7 insertions, 5 deletions
diff --git a/git-apply.html b/git-apply.html
index a26adc3f7..063349350 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -274,7 +274,7 @@ git-apply(1) Manual Page
<div class="sectionbody">
<div class="verseblock">
<div class="content"><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index]
- [--apply] [--no-add] [--index-info] [-R | --reverse]
+ [--apply] [--no-add] [--build-fake-ancestor &lt;file&gt;] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z]
[-pNUM] [-CNUM] [--inaccurate-eof] [--cached]
[--whitespace=&lt;nowarn|warn|error|error-all|strip&gt;]
@@ -364,16 +364,18 @@ and a work tree.</p>
</p>
</dd>
<dt>
---index-info
+--build-fake-ancestor &lt;file&gt;
</dt>
<dd>
<p>
Newer git-diff output has embedded <em>index information</em>
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.
+ the original versions of the blobs is available locally,
+ builds a temporary index containing those blobs.
</p>
+<p>When a pure mode change is encountered (which has no index information),
+the information is read from the current index instead.</p>
</dd>
<dt>
-R, --reverse
@@ -597,7 +599,7 @@ subdirectory is checked and (if possible) updated.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 16-Aug-2007 04:58:55 UTC
+Last updated 24-Sep-2007 07:36:59 UTC
</div>
</div>
</body>