X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=NOTES.git-debrebase;h=ac5a72336b0dab1dce5040e7fa8192f00ac21690;hp=8aed2ff28887803b6481e75e4a2997ca59221a65;hb=5059b05099aabf1228f8a7da6c526ed74f1499b2;hpb=f8ea491fa27e80e4f2fac287d01071b8b27861cc diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index 8aed2ff2..ac5a7233 100644 --- a/NOTES.git-debrebase +++ b/NOTES.git-debrebase @@ -1,5 +1,15 @@ +TODO + more tests, see "todo" in gdr-editw + reference docs + git-debrebase(5) data model + git-debrebase(1) command line + tutorial + dgit-maint-debrebase(7) + + clean up remains of NOTES and README + + arrange for dgit to automatically stitch on push -# # git-ffqrebase start [BASE] # # records previous HEAD so it can be overwritten # # records base for future git-ffqrebase @@ -42,6 +52,7 @@ overall format [git-debrebase: gbp2debrebase, drop patches] [git-debrebase breakwater: declare upstream] +[git-debrebase pseudomerge: stitch] m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]}