diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-28 15:34:39 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-28 15:34:39 +0900 |
| commit | f088858b7d9cf7778d88910914cf7c34d0fdeb83 (patch) | |
| tree | 9218886e61e3784e2ef626190f39003136bb75ad /git-read-tree.html | |
| parent | 20c484eb042459f279c89d562aaf9d77dc2f7862 (diff) | |
| download | git-htmldocs-f088858b7d9cf7778d88910914cf7c34d0fdeb83.tar.gz | |
Autogenerated HTML docs for v2.14.2-642-g20fed
Diffstat (limited to 'git-read-tree.html')
| -rw-r--r-- | git-read-tree.html | 88 |
1 files changed, 39 insertions, 49 deletions
diff --git a/git-read-tree.html b/git-read-tree.html index 3770b9bd5..88bea9a6b 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -1016,54 +1016,44 @@ Here are the "carry forward" rules, where "I" denotes the index, refer to the presence of a path in the specified commit:</p></div>
<div class="literalblock">
<div class="content">
-<pre><code> I H M Result
- -------------------------------------------------------
-0 nothing nothing nothing (does not happen)
-1 nothing nothing exists use M
-2 nothing exists nothing remove path from index
-3 nothing exists exists, use M if "initial checkout",
- H == M keep index otherwise
- exists, fail
- H != M</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code> clean I==H I==M
- ------------------
-4 yes N/A N/A nothing nothing keep index
-5 no N/A N/A nothing nothing keep index</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>6 yes N/A yes nothing exists keep index
-7 no N/A yes nothing exists keep index
-8 yes N/A no nothing exists fail
-9 no N/A no nothing exists fail</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>10 yes yes N/A exists nothing remove path from index
-11 no yes N/A exists nothing fail
-12 yes no N/A exists nothing fail
-13 no no N/A exists nothing fail</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code> clean (H==M)
- ------
-14 yes exists exists keep index
-15 no exists exists keep index</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code> clean I==H I==M (H!=M)
- ------------------
-16 yes no no exists exists fail
-17 no no no exists exists fail
-18 yes no yes exists exists keep index
-19 no no yes exists exists keep index
-20 yes yes no exists exists use M
-21 no yes no exists exists fail</code></pre>
+<pre><code> I H M Result
+ -------------------------------------------------------
+ 0 nothing nothing nothing (does not happen)
+ 1 nothing nothing exists use M
+ 2 nothing exists nothing remove path from index
+ 3 nothing exists exists, use M if "initial checkout",
+ H == M keep index otherwise
+ exists, fail
+ H != M
+
+ clean I==H I==M
+ ------------------
+ 4 yes N/A N/A nothing nothing keep index
+ 5 no N/A N/A nothing nothing keep index
+
+ 6 yes N/A yes nothing exists keep index
+ 7 no N/A yes nothing exists keep index
+ 8 yes N/A no nothing exists fail
+ 9 no N/A no nothing exists fail
+
+ 10 yes yes N/A exists nothing remove path from index
+ 11 no yes N/A exists nothing fail
+ 12 yes no N/A exists nothing fail
+ 13 no no N/A exists nothing fail
+
+ clean (H==M)
+ ------
+ 14 yes exists exists keep index
+ 15 no exists exists keep index
+
+ clean I==H I==M (H!=M)
+ ------------------
+ 16 yes no no exists exists fail
+ 17 no no no exists exists fail
+ 18 yes no yes exists exists keep index
+ 19 no no yes exists exists keep index
+ 20 yes yes no exists exists use M
+ 21 no yes no exists exists fail</code></pre>
</div></div>
<div class="paragraph"><p>In all "keep index" cases, the index entry stays as in the
original index file. If the entry is not up to date,
@@ -1303,7 +1293,7 @@ support.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-05-28 23:19:58 PDT
+Last updated 2017-09-28 15:34:18 JST
</div>
</div>
</body>
|