| commit | 1d25e5bdf5263a227d233eafcf028b36c72716f6 | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 21 Jul 2021 01:42:18 +0000 (21 01:42 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Jul 2021 04:43:12 +0000 (20 21:43 -0700) | ||
| tree | 7434f6179706c23b127959fd2a4afa8e7145a9d2 | treesnapshot (tar.gz zip) |
| parent | be19c5ca3e28cb16d55623de2e5aa1d45bd5b5ba | commitdiff |
t7601: add tests of interactions with multiple merge heads and config
There were already code checking that --rebase was incompatible with
a merge of multiple heads. However, we were sometimes throwing warnings
about lack of specification of rebase vs. merge when given multiple
heads. Since rebasing is disallowed with multiple merge heads, that
seems like a poor warning to print; we should instead just assume
merging is wanted.
Add a few tests checking multiple merge head behavior.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
There were already code checking that --rebase was incompatible with
a merge of multiple heads. However, we were sometimes throwing warnings
about lack of specification of rebase vs. merge when given multiple
heads. Since rebasing is disallowed with multiple merge heads, that
seems like a poor warning to print; we should instead just assume
merging is wanted.
Add a few tests checking multiple merge head behavior.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7601-merge-pull-config.sh | diffblobblamehistory |