diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-28 11:25:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-28 11:25:52 -0700 |
| commit | ae8daba6019fba266ba7afd88aa642bf6994fe2c (patch) | |
| tree | 58982f686dd4612a537d3757bdec7df844c05ef0 /git-rebase--interactive.sh | |
| parent | c12c71fabb3598a480111a31c151bc787cdced30 (diff) | |
| parent | 33ba9c648b6753a4184e53ffb89f0a924f9f7b7e (diff) | |
| download | git-ae8daba6019fba266ba7afd88aa642bf6994fe2c.tar.gz | |
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
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 05f22e43cc..4f499d2c13 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -212,6 +212,7 @@ exit_with_patch () { } die_abort () { + apply_autostash rm -rf "$state_dir" die "$1" } |