diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-13 20:24:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 20:24:17 +0200 |
| commit | 5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc (patch) | |
| tree | 279d8fae60071fc11dbf92e4cc32a9f69acebb65 /git-rebase--interactive.sh | |
| parent | Merge branch 'js/t3404-grammo-fix' (diff) | |
| parent | rebase -i: restore autostash on abort (diff) | |
| download | git-5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc.tar.xz git-5eb1e9f1a0df41cfc6a75cef9c2f11460a6da8dc.zip | |
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
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 068b16722a..ded4595638 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -212,6 +212,7 @@ Once you are satisfied with your changes, run } die_abort () { + apply_autostash rm -rf "$state_dir" die "$1" } |