Skip to content

Commit fd441eb

Browse files
phil-blaingitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9938f30 commit fd441eb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Documentation/merge-options.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ endif::git-pull[]
154154
--autostash::
155155
--no-autostash::
156156
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
158159
that you can run the operation on a dirty worktree. However, use
159160
with care: the final stash application after a successful
160161
merge might result in non-trivial conflicts.

0 commit comments

Comments
 (0)