git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c35952 33ba9c6)
Merge branch 'ps/rebase-i-auto-unstash-upon-abort'
authorJunio C Hamano <redacted>
Wed, 13 Jul 2016 18:24:16 +0000 (11:24 -0700)
committerJunio C Hamano <redacted>
Wed, 13 Jul 2016 18:24:17 +0000 (11:24 -0700)
commit5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc
tree279d8fae60071fc11dbf92e4cc32a9f69acebb65tree | snapshot
parent6c35952a081ad897643d4d23615ccc429c924a39commit | diff
parent33ba9c648b6753a4184e53ffb89f0a924f9f7b7ecommit | diff
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
git-rebase--interactive.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT