summaryrefslogtreecommitdiffstats
path: root/git-apply.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-01-21 17:46:43 +0000
committerJunio C Hamano <junio@kernel.org>2010-01-21 17:46:43 +0000
commit1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch)
tree72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-apply.html
parenta9701f0184382d8de7380c56558718915905746a (diff)
downloadgit-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-apply.html')
-rw-r--r--git-apply.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/git-apply.html b/git-apply.html
index 9306ee111..b09a77f55 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -421,7 +421,7 @@ and does not require them to be in a git repository.</p></div>
</dt>
<dd>
<p>
- Newer <em>git-diff</em> output has embedded <em>index information</em>
+ Newer <em>git diff</em> 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 versions of the blobs are available locally,
@@ -446,7 +446,7 @@ the information is read from the current index instead.</p></div>
</dt>
<dd>
<p>
- For atomicity, <em>git-apply</em> by default fails the whole patch and
+ For atomicity, <em>git apply</em> by default fails the whole patch and
does not touch the working tree when some of the hunks
do not apply. This option makes it apply
the parts of the patch that are applicable, and leave the
@@ -491,7 +491,7 @@ any of those replacements occurred.</p></div>
</dt>
<dd>
<p>
- By default, <em>git-apply</em> expects that the patch being
+ By default, <em>git apply</em> expects that the patch being
applied is a unified diff with at least one line of context.
This provides good safety measures, but breaks down when
applying a diff generated with <tt>--unified=0</tt>. To bypass these
@@ -506,7 +506,7 @@ discouraged.</p></div>
<dd>
<p>
If you use any of the options marked "Turns off
- <em>apply</em>" above, <em>git-apply</em> reads and outputs the
+ <em>apply</em>" above, <em>git apply</em> reads and outputs the
requested information without actually applying the
patch. Give this flag after those flags to also apply
the patch.
@@ -704,7 +704,7 @@ apply.whitespace
</div>
<h2 id="_submodules">Submodules</h2>
<div class="sectionbody">
-<div class="para"><p>If the patch contains any changes to submodules then <em>git-apply</em>
+<div class="para"><p>If the patch contains any changes to submodules then <em>git apply</em>
treats these changes as follows.</p></div>
<div class="para"><p>If <tt>--index</tt> is specified (explicitly or implicitly), then the submodule
commits must match the index exactly for the patch to apply. If any
@@ -729,7 +729,7 @@ subdirectory is checked and (if possible) updated.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-12-03 09:12:26 UTC
+Last updated 2010-01-21 17:44:21 UTC
</div>
</div>
</body>