[PATCH 5/5] docs: MERGE_AUTOSTASH is not that special
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 15, 2023, 20:32 UTC
- Message-ID
- <20231215203245.3622299-6-gitster@pobox.com>
- In-Reply-To
- <20231215203245.3622299-1-gitster@pobox.com>
A handful of manual pages called MERGE_AUTOSTASH 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> --- Documentation/merge-options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index d8f7cd7ca0..3eaefc4e94 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -191,7 +191,7 @@ endif::git-pull[] --autostash:: --no-autostash:: Automatically create a temporary stash entry before the operation - begins, record it in the special ref `MERGE_AUTOSTASH` + begins, record it in the ref `MERGE_AUTOSTASH` and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful
-- 2.43.0-76-g1a87c842ec