mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docs: MERGE_AUTOSTASH is not that special

Browse Source 
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 <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2023-12-15 12:32:45 -08:00
parent dada38646a
commit bc62d27d5c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/merge-options.txt
View File

@ -191,7 +191,7 @@ endif::git-pull[]
--autostash:: --autostash::
--no-autostash:: --no-autostash::
Automatically create a temporary stash entry before the operation 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 and apply it after the operation ends. This means
that you can run the operation on a dirty worktree. However, use that you can run the operation on a dirty worktree. However, use
with care: the final stash application after a successful with care: the final stash application after a successful