summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NOTES.git-debrebase18
1 files changed, 18 insertions, 0 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 0d7bea8..6510c6e 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -29,6 +29,24 @@
=========
+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
git-debrebase blah [implies start] strips pseudomerge(s)