diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-10 14:21:12 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | cfe9f3944eb8e2e4ab7a53518f0a82e5d178467b (patch) | |
tree | f9d30c1f1165fe13919d3911f12ec4bfca08d270 | |
parent | b894911be94f1221ce3d4214b72b819173e3206f (diff) |
git-debrebase: list tags currently written
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | NOTES.git-debrebase | 18 |
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) |