]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a6fb01 e082631)
Merge branch 'pb/merge-autostash-more'
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Aug 2021 20:28:54 +0000 (13:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Aug 2021 20:28:54 +0000 (13:28 -0700)
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

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin/merge.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.