Meta/Reintegrate: make sure a merge stays a merge
Junio C Hamano committed
Oct 16, 2017 at 15:52 UTC
54c4940400f13b60aca8d95e3f7d3872a2840e23
1 file changed
+1
-1
Reintegrate
+1
-1
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