Andrew's git / gitweb.git / diff
?
Merge branch 'ps/rebase-i-auto-unstash-upon-abort'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jul 2016 18:24:16 +0000 (11:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jul 2016 18:24:17 +0000 (11:24 -0700)
"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

1  2 
git-rebase--interactive.sh patch | diff1 | diff2 | blob | history
diff --cc git-rebase--interactive.sh
Simple merge