diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:39:23 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:39:23 +0900 |
commit | 88bf5716b2ea27d90ae93a2f12525a0e143e3b39 (patch) | |
tree | 0ddd74fc574f9dc6ccd7667437b0f60b5fb6a94a /git-apply.html | |
parent | bc39b7db11be3ba4e93e34f706b8a774e523bf1b (diff) | |
download | git-htmldocs-88bf5716b2ea27d90ae93a2f12525a0e143e3b39.tar.gz |
Autogenerated HTML docs for v2.14.1-536-g68672
Diffstat (limited to 'git-apply.html')
-rw-r--r-- | git-apply.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-apply.html b/git-apply.html index 35060f0eb..0efd8fcd9 100644 --- a/git-apply.html +++ b/git-apply.html @@ -840,7 +840,7 @@ and does not require them to be in a Git repository.</p></div> disables it is in effect), make sure the patch is
applicable to what the current index file records. If
the file to be patched in the working tree is not
- up-to-date, it is flagged as an error. This flag also
+ up to date, it is flagged as an error. This flag also
causes the index file to be updated.
</p>
</dd>
@@ -1180,7 +1180,7 @@ treats these changes as follows.</p></div> <div class="paragraph"><p>If <code>--index</code> is specified (explicitly or implicitly), then the submodule
commits must match the index exactly for the patch to apply. If any
of the submodules are checked-out, then these check-outs are completely
-ignored, i.e., they are not required to be up-to-date or clean and they
+ignored, i.e., they are not required to be up to date or clean and they
are not updated.</p></div>
<div class="paragraph"><p>If <code>--index</code> is not specified, then the submodule commits in the patch
are ignored and only the absence or presence of the corresponding
@@ -1203,7 +1203,7 @@ subdirectory is checked and (if possible) updated.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-03-13 00:01:26 PDT
+Last updated 2017-09-10 17:38:46 JST
</div>
</div>
</body>
|