summaryrefslogtreecommitdiff
path: root/t/t7602-merge-octopus-many.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-06-27 00:23:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-27 11:23:22 -0700
commit9929430c32f8754de559e00fba65fd978ecd05da (patch)
treeb0c08e2367ec0f3a5bfd291c7b7dbf47ab7a4459 /t/t7602-merge-octopus-many.sh
parentgit-rebase.sh: update help messages a bit (diff)
downloadtgif-9929430c32f8754de559e00fba65fd978ecd05da.tar.xz
t3422: new testcases for checking when incompatible options passed
git rebase is split into three types: am, merge, and interactive. Various options imply different types, and which mode we are using determine which sub-script (git-rebase--$type) is executed to finish the work. Not all options work with all types, so add tests for combinations where we expect to receive an error rather than having options be silently ignored. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
0 files changed, 0 insertions, 0 deletions