diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 20:30:32 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 21:00:31 +0100 |
| commit | 5caa54e103693bd97c41251d803df83d7ab0c155 (patch) | |
| tree | 20446825e82829036a5a48635dff907c196aa247 | |
| parent | 6392501bee3f167ca61ba648413190ac83cf4257 (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>
| -rwxr-xr-x | git-debrebase | 1 | ||||
| -rw-r--r-- | git-debrebase.5.pod | 2 |
2 files changed, 2 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) { diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index d39ad94..751529e 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -556,6 +556,8 @@ The full set of annotations is: [git-debrebase anchor: declare upstream] [git-debrebase pseudomerge: stitch] + [git-debrebase merged-breakwater: constructed from vanilla merge] + [git-debrebase convert-to-gbp: commit patches] Only anchor merges have the C<[git-debrebase anchor: ...]> tag. |