diff options
-rwxr-xr-x | git-debrebase | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase index 6c1f5d1..b015e88 100755 --- a/git-debrebase +++ b/git-debrebase @@ -772,9 +772,6 @@ sub classify ($) { OrigParents => \@orig_ps); } - if (@p > 2) { - return $unknown->("octopus merge"); - } if (@p == 2 and $r->{Msg} =~ m{^\[git-debrebase merged-breakwater.*\]$}m) { # xxx ^ metadata tag needs adding to (5) @@ -783,6 +780,9 @@ sub classify ($) { if ($r->{Msg} =~ m{^\[(git-debrebase|dgit)[: ].*\]$}m) { return $unknown->("unknown kind of merge from $1"); } + if (@p > 2) { + return $unknown->("octopus merge"); + } if (!$ENV{GIT_DEBREBASE_EXPERIMENTAL_MERGE}) { return $unknown->("general two-parent merge"); |