X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=NOTES.git-debrebase;h=6510c6ec0c294ec554e61e9d1bec8f5dcb2620bd;hb=cfe9f3944eb8e2e4ab7a53518f0a82e5d178467b;hp=0d7bea84daa3f8f392690d1a70968990749df488;hpb=b894911be94f1221ce3d4214b72b819173e3206f;p=dgit.git

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