From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 11:24:05 +0000 (+0000)
Subject: git-debrebase: NOTES: avoid merges
X-Git-Tag: archive/debian/5.0~189
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3d90aa0ebc9d1a48dc7300572fbd58311e0d0ef1;hp=08ff874d10d649cb4ac3664772ac605873445aab

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 2fefa91a..a8e16aff 100644
--- 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