path: root/NOTES.git-debrebase
diff options
Diffstat (limited to 'NOTES.git-debrebase')
1 files changed, 0 insertions, 36 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 09237d5..508d590 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -10,42 +10,6 @@ TODO
arrange for dgit to automatically stitch on push
-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 anchor: convert dgit import, upstream changes]
-[git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]
-[git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]
-[git-debrebase: new upstream NEW-UPSTREAM-VERSION, changelog]
-[git-debrebase convert-from-gbp: drop patches]
-[git-debrebase anchor: declare upstream]
-[git-debrebase pseudomerge: stitch]
-[git-debrebase convert-to-gbp: commit patches]
-m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]}
-Every anchor commit must be a merge. In principle, this is not
-necessary. After all, we are relying on the
- [git-debrebase anchor: ...]
-commit message annotation in "declare" anchor merges (which
-do not have any upstream changes), to distinguish those anchor
-merges from ordinary pseudomerges (which we might just try to strip).
-However, the user is going to be doing git-rebase a lot. We really
-don't want them to rewrite an anchor commit. git-rebase
-trips up on merges, so that is a useful safety catch.
git-debrebase blah [implies start] strips pseudomerge(s)