diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-07-31 08:18:49 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-07-31 12:24:07 -0700 |
| commit | e1fac531ea9f9dc710f6eeae37ea2b38dd5f9fae (patch) | |
| tree | 05eb1f6f1698a4d68106a323685e2e265ff037a9 /zlib.c | |
| parent | t3418: test `rebase -r` with merge strategies (diff) | |
| download | tgif-e1fac531ea9f9dc710f6eeae37ea2b38dd5f9fae.tar.xz | |
rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
When rebasing a complete commit history onto a given commit, it is
pretty obvious that the root commits should be rebased on top of said
given commit.
To test this, let's kill two birds with one stone and add a test case to
t3427-rebase-subtree.sh that not only demonstrates that this works, but
also that `git rebase -r` works with merge strategies now.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'zlib.c')
0 files changed, 0 insertions, 0 deletions