author | Thomas Rast <trast@student.ethz.ch> | |
Wed, 13 Aug 2008 21:41:24 +0000 (23:41 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 13 Aug 2008 22:17:10 +0000 (15:17 -0700) | ||
commit | a96dc01e21603849cb454a311f18780c2e839f29 | |
tree | 5e77504859088bb6a608e96eb4f250ce1a639905 | tree | snapshot |
parent | 71d9451e061841ed5acb576652e09df32c700b86 | commit | diff |
rebase -i -p: fix parent rewriting
The existing parent rewriting did not handle the case where a previous
commit was amended (via edit or squash). Fix by always putting the
new sha1 of the last commit into the $REWRITTEN map.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
The existing parent rewriting did not handle the case where a previous
commit was amended (via edit or squash). Fix by always putting the
new sha1 of the last commit into the $REWRITTEN map.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
git-rebase--interactive.sh | diff | blob | history | |
t/t3404-rebase-interactive.sh | diff | blob | history |