| commit | d9036cd28c9b115fe38e2f629292f2ddf60fb805 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:49:31 +0000 (25 11:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:49:31 +0000 (25 11:49 -0700) | ||
| tree | 3bfea3d65784d1719a86e5d86814ff6a9d81dc9a | treesnapshot (tar.gz zip) |
| parent | 8675779454ed3007bd2a8f83d013e05a65c2d480 | commitdiff |
| parent | ddb5432d2390e1957e473618009ba3d2fbbf29a7 | commitdiff |
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
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
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |
| git-rebase.sh | diff1 | diff2 | blobhistory |