| commit | a5a959d9a8481f46f89be437d7b336c70b473d9b | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 27 Jun 2018 15:48:03 +0000 (27 08:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Jun 2018 19:25:11 +0000 (27 12:25 -0700) | ||
| tree | 8a1e213be63558479c19daa6f50b4bb3c2cdd74e | treesnapshot (tar.gz zip) |
| parent | fc54c1af3ec09bab8b8ea09768c2da4069b7f53e | commitdiff |
t3418: add testcase showing problems with rebase -i and strategy options
We are not passing the same args to merge strategies when we are doing an
--interactive rebase as we do with a --merge rebase. The merge strategy
should not need to be aware of which type of rebase is in effect. Add a
testcase which checks for the appropriate args.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We are not passing the same args to merge strategies when we are doing an
--interactive rebase as we do with a --merge rebase. The merge strategy
should not need to be aware of which type of rebase is in effect. Add a
testcase which checks for the appropriate args.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3418-rebase-continue.sh | diffblobblamehistory |