summaryrefslogtreecommitdiff
path: root/NOTES.git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-17 11:24:05 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:03:11 +0100
commit3d90aa0ebc9d1a48dc7300572fbd58311e0d0ef1 (patch)
treeb524112e3b0c24dc9e6b1987ce8887b523ff6270 /NOTES.git-debrebase
parent08ff874d10d649cb4ac3664772ac605873445aab (diff)
git-debrebase: NOTES: avoid merges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'NOTES.git-debrebase')
-rw-r--r--NOTES.git-debrebase1
1 files changed, 1 insertions, 0 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 2fefa91..a8e16af 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