From 747c6f2eaf1929665a4c19ad4654bba0790b9e01 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 23 Jan 2018 15:19:20 +0000 Subject: [PATCH] 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 --- git-debrebase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) = @_; -- 2.30.2