Re: [PATCH v3 5/7] add tests for rebasing merged history

2013-05-31 Thread Johannes Sixt
Am 31.05.2013 08:49, schrieb Martin von Zweigbergk: > +# f > +# / > +# a---b---c---g---h > +# \ > +# d---G---i > +#\ \ > +# e---u > +# > +# uppercase = cherry-picked > +# h = reverted g ... > +test_expect_success "rebase -p --onto in merged history dr

[PATCH v3 5/7] add tests for rebasing merged history

2013-05-30 Thread Martin von Zweigbergk
--- t/t3400-rebase.sh | 31 + t/t3401-rebase-partial.sh | 45 --- t/t3404-rebase-interactive.sh | 10 +- t/t3409-rebase-preserve-merges.sh | 53 t/t3425-rebase-topology-merges.sh | 252 ++ 5 files changed, 254 ins