diff options
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/git-merge.html b/git-merge.html index 434551199..ade5c345e 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1301,12 +1301,20 @@ For conflicting paths, the index file records up to three versions: stage 1 stores the version from the common ancestor,
stage 2 from <code>HEAD</code>, and stage 3 from <code>MERGE_HEAD</code> (you
can inspect the stages with <code>git ls-files -u</code>). The working
- tree files contain the result of the "merge" program; i.e. 3-way
+ tree files contain the result of the merge operation; i.e. 3-way
merge results with familiar conflict markers <code><<<</code> <code>===</code> <code>>>></code>.
</p>
</li>
<li>
<p>
+A special ref <code>AUTO_MERGE</code> is written, pointing to a tree
+ corresponding to the current content of the working tree (including
+ conflict markers for textual conflicts). Note that this ref is only
+ written when the <em>ort</em> merge strategy is used (the default).
+</p>
+</li>
+<li>
+<p>
No other changes are made. In particular, the local
modifications you had before you started merge will stay the
same and the index entries for them stay as they were,
@@ -1454,7 +1462,8 @@ Use a mergetool. <code>git mergetool</code> to launch a graphical <p>
Look at the diffs. <code>git diff</code> will show a three-way diff,
highlighting changes from both the <code>HEAD</code> and <code>MERGE_HEAD</code>
- versions.
+ versions. <code>git diff AUTO_MERGE</code> will show what changes you’ve
+ made so far to resolve textual conflicts.
</p>
</li>
<li>
@@ -2327,7 +2336,7 @@ merge.<driver>.recursive <div id="footer">
<div id="footer-text">
Last updated
- 2023-01-21 17:52:14 PST
+ 2023-06-23 13:24:09 PDT
</div>
</div>
</body>
|