docs: AUTO_MERGE is not that special
A handful of manual pages called AUTO_MERGE a "special ref", but there is nothing special about it. It merely is yet another pseudoref. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 15, 2023 at 12:32 UTC
dada38646ade5041948bbe49ec21e0f2ad674109
3 files changed
+3
-3
Documentation/git-diff.txt
+1
-1
@@ -103,7 +103,7 @@ Just in case you are doing something exotic, it should be
103
noted that all of the <commit> in the above description, except
104
in the `--merge-base` case and in the last two forms that use `..`
105
notations, can be any <tree>. A tree of interest is the one pointed to
106
-by the special ref `AUTO_MERGE`, which is written by the 'ort' merge
106
+by the ref named `AUTO_MERGE`, which is written by the 'ort' merge
107
strategy upon hitting merge conflicts (see linkgit:git-merge[1]).
108
Comparing the working tree with `AUTO_MERGE` shows changes you've made
109
so far to resolve textual conflicts (see the examples below).
Documentation/git-merge.txt
+1
-1
@@ -196,7 +196,7 @@ happens:
196
can inspect the stages with `git ls-files -u`). The working
197
tree files contain the result of the merge operation; i.e. 3-way
198
merge results with familiar conflict markers `<<<` `===` `>>>`.
199
-5. A special ref `AUTO_MERGE` is written, pointing to a tree
199
+5. A ref named `AUTO_MERGE` is written, pointing to a tree
200
corresponding to the current content of the working tree (including
201
conflict markers for textual conflicts). Note that this ref is only
202
written when the 'ort' merge strategy is used (the default).
Documentation/user-manual.txt
+1
-1
@@ -1344,7 +1344,7 @@ $ git diff --theirs file.txt # same as the above.
1344
-------------------------------------------------
1345
1346
When using the 'ort' merge strategy (the default), before updating the working
1347
-tree with the result of the merge, Git writes a special ref named AUTO_MERGE
1347
+tree with the result of the merge, Git writes a ref named AUTO_MERGE
1348
reflecting the state of the tree it is about to write. Conflicted paths with
1349
textual conflicts that could not be automatically merged are written to this
1350
tree with conflict markers, just as in the working tree. AUTO_MERGE can thus be