summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 15:52:41 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 15:52:41 +0100
commit4d04b76e036b801529fd19a1e45bed0a31a3c8dc (patch)
tree093dc5a3542989d285be9bc8ef10833dc6af596d /git-debrebase
parenta264b74abe1251ab73163cfb9b5a04ff3d41eaf9 (diff)
git-debrebase: merge: Add a comment about rewriting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase
index 499cda2..5de9c14 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -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);