diff options
Diffstat (limited to 'NOTES.git-debrebase')
| -rw-r--r-- | NOTES.git-debrebase | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index 6510c6e..635f72b 100644 --- a/NOTES.git-debrebase +++ b/NOTES.git-debrebase @@ -30,18 +30,20 @@ ========= special commit tags +overall format + [git-debrebase[ COMMIT-TYPE [ ARGS...]]: PROSE, MORE PROSE] -[git-debrebase split mixed commit: debian part] -[git-debrebase split mixed commit: upstream part] -[git-debrebase convert dgit import: debian changes] -[git-debrebase convert dgit import: upstream changes] +[git-debrebase: split mixed commit, debian part] +[git-debrebase: split mixed commit, upstream-part] +[git-debrebase: convert dgit import, debian changes] +[git-debrebase breakwater: convert dgit import, upstream changes] -[git-debrebase new-upstream combine . [PIECES...]] -[git-debrebase new-upstream breakwater NEW-UPSTREAM-VERSION] -[git-debrebase new-upstream changelog NEW-UPSTREAM-VERSION] +[git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream] +[git-debrebase breakwater: new upstream NEW-UPSTREAM-VERSION, merge] +[git-debrebase: new upstream NEW-UPSTREAM-VERSION, changelog] -[git-debrebase gbp2debrebase drop-patches] -[git-debrebase declare-upstream breakwater] +[git-debrebase: gbp2debrebase, drop patches] +[git-debrebase breakwater: declare upstream] m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]} |