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

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

multi-orig upstreams will get a separate commit merging the upstream stuff

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

diff --git a/git-debrebase b/git-debrebase
index 4ca30eb5..5808cf33 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -283,7 +283,7 @@ sub calculate_committer_authline () {
 #
 #   BreakwaterUpstreamMerge
 #     has additional entry in classification result
-#       OrigParents = [ subset of Parents ]
+#       OrigParents = [ subset of Parents ]  # singleton list
 
 sub classify ($) {
     my ($objid) = @_;