| commit | 42f939e4735bc144e1767395e84cffb1bd805a1c | |
| author | Stephen Haberman <stephen@exigencecorp.com> | |
| Wed, 15 Oct 2008 07:44:34 +0000 (15 02:44 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Oct 2008 16:23:53 +0000 (16 09:23 -0700) | ||
| tree | 313657077a53ae0d2c34f158b93f737f3eda6dea | treesnapshot (tar.gz zip) |
| parent | faae853ca622844cbb2982700c43ee9b2d93a2c0 | commitdiff |
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>
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>
| t/t3411-rebase-preserve-around-merges.sh | [new file with mode: 0755] | blob |