Meta/Reintegrate: make sure a merge stays a merge

gitster · gitster · commit 54c4940400f1 · 2017-10-16T15:52:44.000+09:00
diff --git 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
 
