summaryrefslogtreecommitdiff
path: root/Documentation/git-revert.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-08-04 13:28:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-08-04 13:28:54 -0700
commit5fef3b15dbf609bdb13352d0eb716cd79c8ff017 (patch)
tree5be77acecb89de7a756c632ac2c1dd8fde4514a9 /Documentation/git-revert.txt
parentMerge branch 'en/ort-perf-batch-14' (diff)
parentmerge: apply autostash if merge strategy fails (diff)
downloadtgif-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/git-revert.txt')
0 files changed, 0 insertions, 0 deletions