path: root/git-debrebase.5.pod
diff options
authorIan Jackson <>2018-08-25 00:43:17 +0100
committerIan Jackson <>2018-08-25 00:43:17 +0100
commitd8d6dd2d86874c07d5238dd3112ae34ceaf41662 (patch)
treec1dbf1aa652b9d563836b0f61ef0e1b44318d435 /git-debrebase.5.pod
parentfbf9b5517d1c8d3a5e906477b9e4a11866168559 (diff)
git-debrebase: Make all commit annotations have a COMMIT-TYPE
Omitting this sometimes turns out to have a mistake. We are going to want to distinguish at least split from other commits. Add a COMMIT-TYPE to the others as future-proofing. Signed-off-by: Ian Jackson <>
Diffstat (limited to 'git-debrebase.5.pod')
1 files changed, 8 insertions, 6 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod
index f641a70..e3ed309 100644
--- a/git-debrebase.5.pod
+++ b/git-debrebase.5.pod
@@ -551,21 +551,21 @@ in the messages of commits it generates.
The general form is
- [git-debrebase[ COMMIT-TYPE [ ARGS...]]: PROSE, MORE PROSE]
+ [git-debrebase COMMIT-TYPE [ ARGS...]: PROSE, MORE PROSE]
git-debrebase treats anything after the colon as a comment,
paying no attention to PROSE.
The full set of annotations is:
- [git-debrebase: split mixed commit, debian part]
- [git-debrebase: split mixed commit, upstream-part]
- [git-debrebase: convert dgit import, debian changes]
+ [git-debrebase split: mixed commit, debian part]
+ [git-debrebase split: mixed commit, upstream-part]
+ [git-debrebase onvert dgit import: debian changes]
[git-debrebase anchor: convert dgit import, upstream changes]
[git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]
[git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]
- [git-debrebase: new upstream NEW-UPSTREAM-VERSION, changelog]
- [git-debrebase: export and commit patches]
+ [git-debrebase changelog: new upstream NEW-UPSTREAM-VERSION]
+ [git-debrebase make-patches: export and commit patches]
[git-debrebase convert-from-gbp: drop patches]
[git-debrebase anchor: declare upstream]
@@ -574,6 +574,8 @@ The full set of annotations is:
[git-debrebase merged-breakwater: constructed from vanilla merge]
[git-debrebase convert-to-gbp: commit patches]
+ [git-debrebase convert-from-dgit-view upstream-import-convert: VERSION]
+ [git-debrebase convert-from-dgit-view drop-patches]
Only anchor merges have the C<[git-debrebase anchor: ...]> tag.
Single-parent anchors are not generated by git-debrebase,