diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-15 12:32:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-15 14:08:28 -0800 |
| commit | dada38646ade5041948bbe49ec21e0f2ad674109 (patch) | |
| tree | c986c9c13b545acc06c66d4e4af46567c9a79c31 /Documentation/user-manual.txt | |
| parent | 7122f4f7479c59da4230a1a3a129fc618cb01eee (diff) | |
| download | git-dada38646ade5041948bbe49ec21e0f2ad674109.tar.gz | |
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>
Diffstat (limited to 'Documentation/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index d8dbe6b56d..5d32ff2384 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1344,7 +1344,7 @@ $ git diff --theirs file.txt # same as the above. ------------------------------------------------- When using the 'ort' merge strategy (the default), before updating the working -tree with the result of the merge, Git writes a special ref named AUTO_MERGE +tree with the result of the merge, Git writes a ref named AUTO_MERGE reflecting the state of the tree it is about to write. Conflicted paths with textual conflicts that could not be automatically merged are written to this tree with conflict markers, just as in the working tree. AUTO_MERGE can thus be |