X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=NOTES.git-debrebase;h=d2b88b6f19b9c4509d411a485bc038a628319e7d;hb=4f22209a590da904276c3a52643473f44cc22d18;hp=a8e16aff41eda9230a57f76f9f39471fdf3acf28;hpb=3d90aa0ebc9d1a48dc7300572fbd58311e0d0ef1;p=dgit.git diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index a8e16aff..d2b88b6f 100644 --- a/NOTES.git-debrebase +++ b/NOTES.git-debrebase @@ -1,5 +1,4 @@ TODO - more tests, see "todo" in gdr-editw reference docs git-debrebase(5) data model git-debrebase(1) command line @@ -55,6 +54,8 @@ overall format [git-debrebase breakwater: declare upstream] [git-debrebase pseudomerge: stitch] +[git-debrebase convert-to-gbp: commit patches] + m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]} Every breakwater commit must be a merge. In principle, this is not