Skip to content

Commit

Permalink
docs: MERGE_AUTOSTASH is not that special
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
gitster committed Dec 15, 2023
1 parent dada386 commit bc62d27
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Documentation/merge-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bc62d27

Please sign in to comment.