| commit | 71d9451e061841ed5acb576652e09df32c700b86 | |
| author | Thomas Rast <trast@student.ethz.ch> | |
| Wed, 13 Aug 2008 21:41:23 +0000 (13 23:41 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Aug 2008 22:17:09 +0000 (13 15:17 -0700) | ||
| tree | 7321f90e5de8513ad28b82aaebc747657ef10b39 | treesnapshot (tar.gz zip) |
| parent | 65f59e2998c7dd87f61b25fa41bba72fd4247901 | commitdiff |
rebase -i -p: handle index and workdir correctly
'git rebase -i -p' forgot to update the index and working directory
during fast forwards. Fix this. Makes 'GIT_EDITOR=true rebase -i -p
<ancestor>' a no-op again.
Also, it attempted to do a fast forward even if it was instructed not
to commit (via -n). Fall back to the cherry-pick code path and let
that handle the issue for us.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
'git rebase -i -p' forgot to update the index and working directory
during fast forwards. Fix this. Makes 'GIT_EDITOR=true rebase -i -p
<ancestor>' a no-op again.
Also, it attempted to do a fast forward even if it was instructed not
to commit (via -n). Fall back to the cherry-pick code path and let
that handle the issue for us.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
| git-rebase--interactive.sh | diffblobblamehistory | |
| t/t3404-rebase-interactive.sh | diffblobblamehistory |