From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Apr 2020 23:15:27 +0000 (-0700)
Subject: Merge branch 'dl/merge-autostash-rebase-quit-fix'
X-Git-Tag: v2.27.0-rc0~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3afdeef33e1d7912b8b135df2ea3fef3a3cf60bc;p=thirdparty%2Fgit.git

Merge branch 'dl/merge-autostash-rebase-quit-fix'

The stash entry created by "git rebase --autosquash" to keep the
initial dirty state were discarded by mistake upon "git rebase
--quit", which has been corrected.

* dl/merge-autostash-rebase-quit-fix:
  rebase: save autostash entry into stash reflog on --quit
---

3afdeef33e1d7912b8b135df2ea3fef3a3cf60bc