chiark / gitweb /
git-debrebase: merge: Add a comment about rewriting
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 14:52:41 +0000 (15:52 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 14:52:41 +0000 (15:52 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index 499cda2..5de9c14 100755 (executable)
@@ -1217,6 +1217,9 @@ sub walk ($;$$$) {
            }
 
            if ($ok && $might_be_in_bw) {
+               # We could rewrite this to contaion the metadata
+               # declaring it to be MergedBreakwaters, but
+               # unnecessarily rewriting a merge seems unhelpful.
                $prline->(" VanillaMerge MergedBreakwaters");
                $last_anchor = $best_anchor;
                $build_start->('MergedBreakwaters', $cur);