2 Commits

Author	SHA1	Message	Date
Stephen Haberman	80fe82e4eb	rebase-i-p: if todo was reordered use HEAD as the rewritten parent ... This seems like the best guess we can make until git sequencer marks are available. That being said, within the context of re-ordering a commit before its parent in todo, I think applying it on top of the current commit seems like a reasonable assumption of what the user intended. Signed-off-by: Stephen Haberman <stephen@exigencecorp.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-10-16 09:23:54 -07:00
Stephen Haberman	42f939e473	rebase-i-p: test to exclude commits from todo based on its parents ... The first case was based off a script from Avi Kivity <avi@redhat.com>. The second case includes a merge-of-a-merge to ensure both are included in todo. Signed-off-by: Stephen Haberman <stephen@exigencecorp.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-10-16 09:23:53 -07:00