chiark / gitweb /
git-debrebase: fix: document that breakwater merges always have single parent
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 23 Jan 2018 15:20:02 +0000 (15:20 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index 62fbc4d..128f2f1 100755 (executable)
@@ -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");
 }