diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-27 15:51:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-27 15:51:52 -0800 |
| commit | 7ae46b40202f2928d34d523c62e7c215f44f91bf (patch) | |
| tree | ffb22c4c699c9a6be3281ddd35ee32753d75141a /merge-options.txt | |
| parent | 8c556f838df5e9e4fbfe52d9ad098610973b13bf (diff) | |
| download | git-htmldocs-7ae46b40202f2928d34d523c62e7c215f44f91bf.tar.gz | |
Autogenerated HTML docs for v2.43.0-232-ge7955
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-options.txt b/merge-options.txt index d8f7cd7ca..3eaefc4e9 100644 --- a/merge-options.txt +++ b/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 |