From 54c4940400f13b60aca8d95e3f7d3872a2840e23 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 16 Oct 2017 15:52:44 +0900 Subject: [PATCH] Meta/Reintegrate: make sure a merge stays a merge --- Reintegrate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.47.3