git-debrebase: do not bomb on totally ambiguous pseudomerges

[dgit.git] / NOTES.git-debrebase

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 2fefa91a638b0d182ccececada782bf15b21bdee..1cfa070b2d2046c3705395687e13825a6524c9ce 100644 (file)
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -5,6 +5,7 @@ TODO
       git-debrebase(1)   command line
    tutorial
       dgit-maint-debrebase(7)
+      someone should set branch.<name>.mergeOptions to include --ff-only ?
 
    clean up remains of NOTES and README
 
@@ -54,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