diff options
| author |  Stephen Haberman <stephen@exigencecorp.com> | 2008-10-05 23:26:52 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-10-16 09:20:59 -0700 |
| commit | faae853ca622844cbb2982700c43ee9b2d93a2c0 (patch) | |
| tree | 0ec5ec3aff9b032e56713ab30de061b394e89923 /Documentation/RelNotes-1.5.6.4.txt | |
| parent | remote.c: correct the check for a leading '/' in a remote name (diff) | |
| download | tgif-faae853ca622844cbb2982700c43ee9b2d93a2c0.tar.xz | |
rebase--interactive: fix parent rewriting for dropped commits
`rebase -i -p` got its rev-list of commits to keep by --left-right and
--cherry-pick. Adding --cherry-pick would drop commits that duplicated changes
already in the rebase target.
The dropped commits were then forgotten about when it came to rewriting the
parents of their descendents, so the descendents would get cherry-picked with
their old, unwritten parents and essentially make the rebase a no-op.
This commit adds a $DOTEST/dropped directory to remember dropped commits and
rewrite their children's parent as the dropped commit's possibly-rewritten
first-parent.
Signed-off-by: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/RelNotes-1.5.6.4.txt')
0 files changed, 0 insertions, 0 deletions