summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-19 20:30:32 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-19 21:00:31 +0100
commit5caa54e103693bd97c41251d803df83d7ab0c155 (patch)
tree20446825e82829036a5a48635dff907c196aa247 /git-debrebase
parent6392501bee3f167ca61ba648413190ac83cf4257 (diff)
git-debrebase: Document merged-breakwater metadata tag
This is generated only by the experimental merge machinery and is subject to possible future change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase1
1 files changed, 0 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 3693190..2e027f5 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -978,7 +978,6 @@ sub classify ($) {
if (@p == 2 and
$r->{Msg} =~ m{^\[git-debrebase merged-breakwater.*\]$}m) {
- # xxx ^ metadata tag needs adding to (5)
return $classify->("MergedBreakwaters");
}
if ($r->{Msg} =~ m{^\[(git-debrebase|dgit)[: ].*\]$}m) {