From cfe9f3944eb8e2e4ab7a53518f0a82e5d178467b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Feb 2018 14:21:12 +0000 Subject: [PATCH] git-debrebase: list tags currently written Signed-off-by: Ian Jackson --- NOTES.git-debrebase | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index 0d7bea84..6510c6ec 100644 --- a/NOTES.git-debrebase +++ b/NOTES.git-debrebase @@ -27,6 +27,24 @@ # the previous pseudomerge check for tags and remote branches ? +========= + +special commit tags + +[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 new-upstream combine . [PIECES...]] +[git-debrebase new-upstream breakwater NEW-UPSTREAM-VERSION] +[git-debrebase new-upstream changelog NEW-UPSTREAM-VERSION] + +[git-debrebase gbp2debrebase drop-patches] +[git-debrebase declare-upstream breakwater] + +m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]} + ========= workflow -- 2.30.2