chiark / gitweb /
git-debrebase: document that breakwater merges always have single parent
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 23 Jan 2018 15:19:20 +0000 (15:19 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
multi-orig upstreams will get a separate commit merging the upstream stuff

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

index 4ca30eb..5808cf3 100755 (executable)
@@ -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) = @_;