From: Philippe Blain Date: Fri, 23 Jul 2021 12:14:28 +0000 (+0000) Subject: Documentation: define 'MERGE_AUTOSTASH' X-Git-Tag: v2.33.0-rc1~9^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd441eb612b28e2b0f512ad6d98859c9e82a2cbd;p=thirdparty%2Fgit.git Documentation: define 'MERGE_AUTOSTASH' The documentation for 'git merge --abort' and 'git merge --quit' both mention the special ref 'MERGE_AUTOSTASH', but this ref is not formally defined anywhere. Mention it in the description of the '--autostash' option for 'git merge'. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano --- diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index eb0aabd396..52565014c1 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -154,7 +154,8 @@ endif::git-pull[] --autostash:: --no-autostash:: Automatically create a temporary stash entry before the operation - begins, and apply it after the operation ends. This means + begins, record it in the special 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 merge might result in non-trivial conflicts.