From: Ian Jackson Date: Sat, 10 Feb 2018 14:21:12 +0000 (+0000) Subject: git-debrebase: list tags currently written X-Git-Tag: archive/debian/5.0~259 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=cfe9f3944eb8e2e4ab7a53518f0a82e5d178467b;hp=b894911be94f1221ce3d4214b72b819173e3206f git-debrebase: list tags currently written Signed-off-by: Ian Jackson --- 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