From 5280cd6e973c26b5de6217a88ca88e3448d69fb2 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 Feb 2012 16:03:10 -0800
Subject: [PATCH] Meta/Reintegrate: use merge --no-edit

---
 Reintegrate | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"