From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Oct 2017 06:52:44 +0000 (+0900)
Subject: Meta/Reintegrate: make sure a merge stays a merge
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54c4940400f13b60aca8d95e3f7d3872a2840e23;p=thirdparty%2Fgit.git

Meta/Reintegrate: make sure a merge stays a merge
---

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