]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c12c71f 33ba9c6)
Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 18:25:52 +0000 (11:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 18:25:52 +0000 (11:25 -0700)
commitae8daba6019fba266ba7afd88aa642bf6994fe2c
tree58982f686dd4612a537d3757bdec7df844c05ef0tree | snapshot
parentc12c71fabb3598a480111a31c151bc787cdced30commit | diff
parent33ba9c648b6753a4184e53ffb89f0a924f9f7b7ecommit | diff
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
git-rebase--interactive.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.