From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Feb 2012 00:03:10 +0000 (-0800)
Subject: Meta/Reintegrate: use merge --no-edit
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5280cd6e973c26b5de6217a88ca88e3448d69fb2;p=thirdparty%2Fgit.git

Meta/Reintegrate: use merge --no-edit
---

diff --git a/Reintegrate b/Reintegrate
index ed57047217..686b6f464e 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -45,7 +45,7 @@ no)
 			save=$(git rev-parse --verify HEAD)
 
 			echo >&2 "* $branch"
-			git merge "$branch" || accept_rerere || exit
+			git merge --no-edit "$branch" || accept_rerere || exit
 
 			this=$(git rev-parse --verify HEAD)
 			if test "$this" = "$save"