diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-06-27 08:48:03 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-27 12:25:11 -0700 |
| commit | a5a959d9a8481f46f89be437d7b336c70b473d9b (patch) | |
| tree | 8a1e213be63558479c19daa6f50b4bb3c2cdd74e /builtin/patch-id.c | |
| parent | Git 2.17.1 (diff) | |
| download | tgif-a5a959d9a8481f46f89be437d7b336c70b473d9b.tar.xz | |
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>
Diffstat (limited to 'builtin/patch-id.c')
0 files changed, 0 insertions, 0 deletions