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 /archive-zip.c | |
| 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 'archive-zip.c')
0 files changed, 0 insertions, 0 deletions