Meta/Reintegrate: make sure a merge stays a merge

diff --git a/Reintegrate b/Reintegrate
index 7767a079b54239f9edf88c2169c73d9f1bb6b373..91089880925cda59a665677de9ced3caa9eac729 100755 (executable)
--- a/Reintegrate
+++ b/Reintegrate
@@ -170,7 +170,7 @@ no)
 
                        rebuild=$(git config "branch.$branch.rebuild" || :)
 
-                       GIT_EDITOR=: git merge $rebuild $accept_rerere --edit "$branch" ||
+                       GIT_EDITOR=: git merge --no-ff $rebuild $accept_rerere --edit "$branch" ||
                        accept_rerere ||
                        exit