git-debrebase: NOTES: avoid merges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 2fefa91a638b0d182ccececada782bf15b21bdee..a8e16aff41eda9230a57f76f9f39471fdf3acf28 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