diff options
Diffstat (limited to 'git-diff.html')
| -rw-r--r-- | git-diff.html | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/git-diff.html b/git-diff.html index 5cf1b5ead..110ee5fba 100644 --- a/git-diff.html +++ b/git-diff.html @@ -876,7 +876,11 @@ of <commit> and HEAD. <code>git diff --merge-base A</code> is equivalent <div class="paragraph"><p>Just in case you are doing something exotic, it should be
noted that all of the <commit> in the above description, except
in the <code>--merge-base</code> case and in the last two forms that use <code>..</code>
-notations, can be any <tree>.</p></div>
+notations, can be any <tree>. A tree of interest is the one pointed to
+by the special ref <code>AUTO_MERGE</code>, which is written by the <em>ort</em> merge
+strategy upon hitting merge conflicts (see <a href="git-merge.html">git-merge(1)</a>).
+Comparing the working tree with <code>AUTO_MERGE</code> shows changes you’ve made
+so far to resolve textual conflicts (see the examples below).</p></div>
<div class="paragraph"><p>For a more complete list of ways to spell <commit>, see
"SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>.
However, "diff" is about comparing two <em>endpoints</em>, not ranges,
@@ -2849,7 +2853,8 @@ Various ways to check your working tree <div class="content">
<pre><code>$ git diff <b><1></b>
$ git diff --cached <b><2></b>
-$ git diff HEAD <b><3></b></code></pre>
+$ git diff HEAD <b><3></b>
+$ git diff AUTO_MERGE <b><4></b></code></pre>
</div></div>
<div class="colist arabic"><ol>
<li>
@@ -2869,6 +2874,12 @@ Changes in the working tree since your last commit; what you would be committing if you run <code>git commit -a</code>
</p>
</li>
+<li>
+<p>
+Changes in the working tree you’ve made to resolve textual
+ conflicts so far.
+</p>
+</li>
</ol></div>
</dd>
<dt class="hdlist1">
@@ -3659,7 +3670,7 @@ diff.colorMovedWS <div id="footer">
<div id="footer-text">
Last updated
- 2022-10-26 11:43:43 PDT
+ 2023-06-23 13:24:09 PDT
</div>
</div>
</body>
|