diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-15 12:32:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-15 14:08:28 -0800 |
| commit | bc62d27d5c2379505436cb8968c153c8b3a25d39 (patch) | |
| tree | 97116469e9dde3672f186c2eef226595728ea572 /Documentation/merge-options.txt | |
| parent | dada38646ade5041948bbe49ec21e0f2ad674109 (diff) | |
| download | git-bc62d27d5c2379505436cb8968c153c8b3a25d39.tar.gz | |
docs: MERGE_AUTOSTASH is not that special
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>
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index d8f7cd7ca0..3eaefc4e94 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -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 |