Meta/Reintegrate: use merge --no-edit
Junio C Hamano committed
Feb 9, 2012 at 16:03 UTC
5280cd6e973c26b5de6217a88ca88e3448d69fb2
1 file changed
+1
-1
Reintegrate
+1
-1
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"