aboutsummaryrefslogtreecommitdiff
path: root/t/t3411-rebase-preserve-around-merges.sh
Commit message (Collapse)AuthorAge
* Simplify t3411Johannes Schindelin2009-01-28
| | | | | | | | Use test_commit() and test_merge(). This way, it is harder to forget to tag, or to call test_tick before committing. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* t3404 & t3411: undo copy&pasteJohannes Schindelin2009-01-28
| | | | | | | | Rather than copying and pasting, which is prone to lead to fixes missing in one version, move the fake-editor generator to t/t3404/. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Make t3411 executableMiklos Vajna2009-01-14
| | | | | Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* rebase-i-p: if todo was reordered use HEAD as the rewritten parentStephen Haberman2008-10-16
| | | | | | | | | | 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>
* rebase-i-p: test to exclude commits from todo based on its parentsStephen Haberman2008-10-16
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>