From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Aug 2021 20:28:54 +0000 (-0700)
Subject: Merge branch 'pb/merge-autostash-more'
X-Git-Tag: v2.33.0-rc1~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fef3b15dbf609bdb13352d0eb716cd79c8ff017;p=thirdparty%2Fgit.git

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
---

5fef3b15dbf609bdb13352d0eb716cd79c8ff017