summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 62fbc4d..128f2f1 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -443,9 +443,11 @@ sub classify ($) {
return $classify->(qw(BreakwaterUpstreamMerge),
OrigParents => [ $p[!$prevbrw] ]);
}
- # xxx multi-.orig upstreams
}
+ # multi-orig upstreams are represented with a breakwater merge
+ # from a single upstream commit which combines the orig tarballs
+
return $unknown->("complex merge");
}