| commit | f67336dabf8b77f1eee0341790c8fbbe5c6d81dd | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Wed, 31 Jul 2019 15:18:45 +0000 (31 08:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 31 Jul 2019 19:24:07 +0000 (31 12:24 -0700) | ||
| tree | d0273c98e93bf7389ee8846626d741835d780071 | treesnapshot (tar.gz zip) |
| parent | a9c71073dace0d1ddbd12291604d191064b1ae94 | commitdiff |
t3427: accommodate for the `rebase --merge` backend having been replaced
Since 68aa495b590 (rebase: implement --merge via the interactive
machinery, 2018-12-11), the job of the old `--merge` backend is now
performed by the `--interactive` backend, too.
One consequence is that empty commits are no longer rebased by default.
Meaning that the test case that calls `git rebase -Xsubtree` (which used
to be handled by the `--merge` backend) now needs to ask explicitly for
the empty commit to be rebased.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Since 68aa495b590 (rebase: implement --merge via the interactive
machinery, 2018-12-11), the job of the old `--merge` backend is now
performed by the `--interactive` backend, too.
One consequence is that empty commits are no longer rebased by default.
Meaning that the test case that calls `git rebase -Xsubtree` (which used
to be handled by the `--merge` backend) now needs to ask explicitly for
the empty commit to be rebased.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3427-rebase-subtree.sh | diffblobblamehistory |