diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:49:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:49:31 -0700 |
| commit | d9036cd28c9b115fe38e2f629292f2ddf60fb805 (patch) | |
| tree | 3bfea3d65784d1719a86e5d86814ff6a9d81dc9a /ll-merge.c | |
| parent | Merge branch 'jc/shortlog-ref-exclude' into maint (diff) | |
| parent | rebase -i: test "Nothing to do" case with autostash (diff) | |
| download | tgif-d9036cd28c9b115fe38e2f629292f2ddf60fb805.tar.xz | |
Merge branch 'rr/rebase-autostash-fix' into maint
The autostash mode of "git rebase -i" did not restore the dirty
working tree state if the user aborted the interactive rebase by
emptying the insn sheet.
* rr/rebase-autostash-fix:
rebase -i: test "Nothing to do" case with autostash
rebase -i: handle "Nothing to do" case with autostash
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions