From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 23 Jan 2018 15:20:02 +0000 (+0000)
Subject: git-debrebase: fix: document that breakwater merges always have single parent
X-Git-Tag: archive/debian/5.0~305
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=432493a8a7894872312451fac17918ab8dbb5576;p=dgit.git

git-debrebase: fix: document that breakwater merges always have single parent

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 62fbc4d5..128f2f1d 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");
 }