From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jul 2016 18:24:16 +0000 (-0700)
Subject: Merge branch 'ps/rebase-i-auto-unstash-upon-abort'
X-Git-Tag: v2.10.0-rc0~122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc;p=thirdparty%2Fgit.git

Merge branch 'ps/rebase-i-auto-unstash-upon-abort'

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

5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc