X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=NOTES.git-debrebase;h=1cfa070b2d2046c3705395687e13825a6524c9ce;hb=c386ae2688431a622f9d41b3668755420fcbed39;hp=a8e16aff41eda9230a57f76f9f39471fdf3acf28;hpb=3d90aa0ebc9d1a48dc7300572fbd58311e0d0ef1;p=dgit.git diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index a8e16aff..1cfa070b 100644 --- a/NOTES.git-debrebase +++ b/NOTES.git-debrebase @@ -55,6 +55,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