summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Philippe Blain <levraiphilippeblain@gmail.com>2021-07-23 12:14:28 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-23 15:45:35 -0700
commitfd441eb612b28e2b0f512ad6d98859c9e82a2cbd (patch)
treeb894d916a3a76532a66609ab9d14965dad7947f3
parentmerge: add missing word "strategy" to a message (diff)
downloadtgif-fd441eb612b28e2b0f512ad6d98859c9e82a2cbd.tar.xz
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>
-rw-r--r--Documentation/merge-options.txt3
1 files changed, 2 insertions, 1 deletions
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.