Skip to content

Commit dada386

Browse files
committed
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 <[email protected]>
1 parent 7122f4f commit dada386

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Documentation/git-diff.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Just in case you are doing something exotic, it should be
103103
noted that all of the <commit> in the above description, except
104104
in the `--merge-base` case and in the last two forms that use `..`
105105
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
107107
strategy upon hitting merge conflicts (see linkgit:git-merge[1]).
108108
Comparing the working tree with `AUTO_MERGE` shows changes you've made
109109
so far to resolve textual conflicts (see the examples below).

Documentation/git-merge.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ happens:
196196
can inspect the stages with `git ls-files -u`). The working
197197
tree files contain the result of the merge operation; i.e. 3-way
198198
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
200200
corresponding to the current content of the working tree (including
201201
conflict markers for textual conflicts). Note that this ref is only
202202
written when the 'ort' merge strategy is used (the default).

Documentation/user-manual.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1344,7 +1344,7 @@ $ git diff --theirs file.txt # same as the above.
13441344
-------------------------------------------------
13451345

13461346
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
13481348
reflecting the state of the tree it is about to write. Conflicted paths with
13491349
textual conflicts that could not be automatically merged are written to this
13501350
tree with conflict markers, just as in the working tree. AUTO_MERGE can thus be

0 commit comments

Comments
 (0)