From: Junio C Hamano Date: Fri, 15 Dec 2023 20:32:45 +0000 (-0800) Subject: docs: MERGE_AUTOSTASH is not that special X-Git-Tag: v2.43.1~18^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc62d27d5c2379505436cb8968c153c8b3a25d39;p=thirdparty%2Fgit.git docs: MERGE_AUTOSTASH is not that special 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 --- 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