| commit | 5fef3b15dbf609bdb13352d0eb716cd79c8ff017 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 4 Aug 2021 20:28:54 +0000 (4 13:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 4 Aug 2021 20:28:54 +0000 (4 13:28 -0700) | ||
| tree | 5be77acecb89de7a756c632ac2c1dd8fde4514a9 | treesnapshot (tar.gz zip) |
| parent | 1a6fb019d6c09f5e7e2b76fab2a6ad50a8506461 | commitdiff |
| parent | e082631e51ebe2c7ee6756a3b45d10732a6480df | commitdiff |
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
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
| builtin/merge.c | diff1 | diff2 | blobhistory |