diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:54 -0700 |
| commit | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch) | |
| tree | 4a681cad5c6da23a7d7f56022666fb31397026d2 /git-read-tree.html | |
| parent | 359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff) | |
| download | git-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz | |
Autogenerated HTML docs for v2.42.0-482-g2e8e7
Diffstat (limited to 'git-read-tree.html')
| -rw-r--r-- | git-read-tree.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-read-tree.html b/git-read-tree.html index 716b1d4e4..1968d7e86 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -766,8 +766,8 @@ but does not actually <strong>update</strong> any of the files it "caches". (see fast-forward (i.e. 2-way) merge, or a 3-way merge, with the <code>-m</code>
flag. When used with <code>-m</code>, the <code>-u</code> flag causes it to also update
the files in the work tree with the result of the merge.</p></div>
-<div class="paragraph"><p>Trivial merges are done by <em>git read-tree</em> itself. Only conflicting paths
-will be in unmerged state when <em>git read-tree</em> returns.</p></div>
+<div class="paragraph"><p>Only trivial merges are done by <em>git read-tree</em> itself. Only conflicting paths
+will be in an unmerged state when <em>git read-tree</em> returns.</p></div>
</div>
</div>
<div class="sect1">
@@ -781,7 +781,7 @@ will be in unmerged state when <em>git read-tree</em> returns.</p></div> <p>
Perform a merge, not just a read. The command will
refuse to run if your index file has unmerged entries,
- indicating that you have not finished previous merge you
+ indicating that you have not finished a previous merge you
started.
</p>
</dd>
@@ -1294,7 +1294,7 @@ support.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-01-30 14:44:53 PST
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>
|