diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:08 -0800 |
| commit | 79f79e58a4242ea2b492734a0c4984ded58907cc (patch) | |
| tree | b0801a94757073e902a50b6cc32ac380fefb2bd8 /Documentation/git-diff.txt | |
| parent | Merge branch 'es/add-doc-list-short-form-of-all-in-synopsis' into maint-2.43 (diff) | |
| parent | docs: MERGE_AUTOSTASH is not that special (diff) | |
| download | git-79f79e58a4242ea2b492734a0c4984ded58907cc.tar.gz git-79f79e58a4242ea2b492734a0c4984ded58907cc.zip | |
Merge branch 'jc/doc-most-refs-are-not-that-special' into maint-2.43
Doc updates.
* jc/doc-most-refs-are-not-that-special:
docs: MERGE_AUTOSTASH is not that special
docs: AUTO_MERGE is not that special
refs.h: HEAD is not that special
git-bisect.txt: BISECT_HEAD is not that special
git.txt: HEAD is not that special
Diffstat (limited to 'Documentation/git-diff.txt')
| -rw-r--r-- | Documentation/git-diff.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 08087ffad5..c065f023ec 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -103,7 +103,7 @@ Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the `--merge-base` case and in the last two forms that use `..` notations, can be any <tree>. A tree of interest is the one pointed to -by the special ref `AUTO_MERGE`, which is written by the 'ort' merge +by the ref named `AUTO_MERGE`, which is written by the 'ort' merge strategy upon hitting merge conflicts (see linkgit:git-merge[1]). Comparing the working tree with `AUTO_MERGE` shows changes you've made so far to resolve textual conflicts (see the examples below). |