From: Junio C Hamano Date: Thu, 28 Jul 2016 18:25:52 +0000 (-0700) Subject: Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maint X-Git-Tag: v2.9.3~58 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ae8daba6019fba266ba7afd88aa642bf6994fe2c Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maint "git rebase -i --autostash" did not restore the auto-stashed change when the operation was aborted. * ps/rebase-i-auto-unstash-upon-abort: rebase -i: restore autostash on abort --- ae8daba6019fba266ba7afd88aa642bf6994fe2c