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 <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Philippe Blain committed
Jul 23, 2021 at 12:14 UTC
fd441eb612b28e2b0f512ad6d98859c9e82a2cbd
1 file changed
+2
-1
Documentation/merge-options.txt
+2
-1
@@ -154,7 +154,8 @@ endif::git-pull[]
154
--autostash::
155
--no-autostash::
156
Automatically create a temporary stash entry before the operation
157
- begins, and apply it after the operation ends. This means
157
+ begins, record it in the special ref `MERGE_AUTOSTASH`
158
+ and apply it after the operation ends. This means
159
that you can run the operation on a dirty worktree. However, use
160
with care: the final stash application after a successful
161
merge might result in non-trivial conflicts.