X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=NOTES.git-debrebase;h=1cfa070b2d2046c3705395687e13825a6524c9ce;hp=a8e16aff41eda9230a57f76f9f39471fdf3acf28;hb=efd164b666d95dec51c55c1dfe4364e59c360add;hpb=971d00a91614c91d96413d0d17dee531b3ed0935 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