diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-23 15:20:02 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | 432493a8a7894872312451fac17918ab8dbb5576 (patch) | |
tree | 60aebb56ac39385061c33082569dd873ad06f252 | |
parent | c0e4a8e072c2b133c5aa27a9636ce97521ad3ebf (diff) |
git-debrebase: fix: document that breakwater merges always have single parent
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | git-debrebase | 4 |
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"); } |