diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-08-04 13:28:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-04 13:28:54 -0700 |
| commit | 5fef3b15dbf609bdb13352d0eb716cd79c8ff017 (patch) | |
| tree | 5be77acecb89de7a756c632ac2c1dd8fde4514a9 /Documentation | |
| parent | Merge branch 'en/ort-perf-batch-14' (diff) | |
| parent | merge: apply autostash if merge strategy fails (diff) | |
| download | tgif-5fef3b15dbf609bdb13352d0eb716cd79c8ff017.tar.xz | |
Merge branch 'pb/merge-autostash-more'
The local changes stashed by "git merge --autostash" were lost when
the merge failed in certain ways, which has been corrected.
* pb/merge-autostash-more:
merge: apply autostash if merge strategy fails
merge: apply autostash if fast-forward fails
Documentation: define 'MERGE_AUTOSTASH'
merge: add missing word "strategy" to a message
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-options.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index eb0aabd396..52565014c1 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -154,7 +154,8 @@ endif::git-pull[] --autostash:: --no-autostash:: Automatically create a temporary stash entry before the operation - begins, and apply it after the operation ends. This means + begins, record it in the special 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 merge might result in non-trivial conflicts. |