| commit | a63f990d9205d1a781aec310e44edf35e29063a2 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Wed, 31 Jul 2019 15:18:49 +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 | 5ed548a2d14c4eaef160b71d082e5e24df9d580d | treesnapshot (tar.gz zip) |
| parent | 5dcdd7409ad3b3e8d5e79871bfb9d5f4215d4a13 | commitdiff |
t3418: test `rebase -r` with merge strategies
There is a test case in this script that verifies that `git rebase
--preserve-merges` works all right with non-default merge strategies or
non-default merge strategy options.
Now that `git rebase --rebase-merges` learned about merge strategies,
let's copy-edit this test case to verify that that works as intended,
too.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
There is a test case in this script that verifies that `git rebase
--preserve-merges` works all right with non-default merge strategies or
non-default merge strategy options.
Now that `git rebase --rebase-merges` learned about merge strategies,
let's copy-edit this test case to verify that that works as intended,
too.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3418-rebase-continue.sh | diffblobblamehistory |