diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-31 16:16:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-31 16:16:35 -0700 |
| commit | cf8aeaf7e987e73615910d6961e38f20a8b0b550 (patch) | |
| tree | 164cec121c10fbb4824768577408ce4bca9855bf /git-apply.html | |
| parent | c0926523a55c2dd1314deb3281dabb03b2d5f965 (diff) | |
| download | git-htmldocs-cf8aeaf7e987e73615910d6961e38f20a8b0b550.tar.gz | |
Autogenerated HTML docs for v2.28.0-394-ge1971
Diffstat (limited to 'git-apply.html')
| -rw-r--r-- | git-apply.html | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/git-apply.html b/git-apply.html index b089ae2bb..aa10073ae 100644 --- a/git-apply.html +++ b/git-apply.html @@ -836,13 +836,13 @@ and does not require them to be in a Git repository.</p></div> </dt>
<dd>
<p>
- When <code>--check</code> is in effect, or when applying the patch
- (which is the default when none of the options that
- 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
- causes the index file to be updated.
+ Apply the patch to both the index and the working tree (or
+ merely check that it would apply cleanly to both if <code>--check</code> is
+ in effect). Note that <code>--index</code> expects index entries and
+ working tree copies for relevant paths to be identical (their
+ contents and metadata such as file mode must match), and will
+ raise an error if they are not, even if the patch would apply
+ cleanly to both the index and the working tree in isolation.
</p>
</dd>
<dt class="hdlist1">
@@ -850,9 +850,9 @@ and does not require them to be in a Git repository.</p></div> </dt>
<dd>
<p>
- 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 <code>--index</code>.
+ Apply the patch to just the index, without touching the working
+ tree. If <code>--check</code> is in effect, merely check that it would
+ apply cleanly to the index entry.
</p>
</dd>
<dt class="hdlist1">
@@ -1220,7 +1220,7 @@ subdirectory is checked and (if possible) updated.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-08-31 16:12:31 PDT
</div>
</div>
</body>
|