From 432493a8a7894872312451fac17918ab8dbb5576 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 23 Jan 2018 15:20:02 +0000
Subject: git-debrebase: fix: document that breakwater merges always have
 single parent

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'git-debrebase')

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");
 }
 
-- 
cgit v1.2.3