diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2008-08-13 23:41:23 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-08-13 15:17:09 -0700 |
| commit | 71d9451e061841ed5acb576652e09df32c700b86 (patch) | |
| tree | 7321f90e5de8513ad28b82aaebc747657ef10b39 /builtin-read-tree.c | |
| parent | GIT 1.6.0-rc3 (diff) | |
| download | tgif-71d9451e061841ed5acb576652e09df32c700b86.tar.xz | |
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>
Diffstat (limited to 'builtin-read-tree.c')
0 files changed, 0 insertions, 0 deletions