diff --git a/Reintegrate b/Reintegrate
index 7767a079b5..9108988092 100755
--- 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