From: Glenn Morris <rgm@gnu.org>
Date: Fri, 23 Feb 2018 17:52:11 +0000 (-0500)
Subject: * admin/automerge: Quieten initial pull if start with reset.
X-Git-Tag: emacs-27.0.90~5634
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8156e3f3e04e7f9ac1bb2b8acc58153cfaaab2c9;p=emacs.git

* admin/automerge: Quieten initial pull if start with reset.
---

diff --git a/admin/automerge b/admin/automerge
index ba608d10904..520961f1e88 100755
--- a/admin/automerge
+++ b/admin/automerge
@@ -141,7 +141,7 @@ trap "rm -f $tempfile 2> /dev/null" EXIT
     git reset --hard origin/master || die "reset error"
 
     echo "Pulling..."
-    git pull --ff-only || die "pull error"
+    git pull -q --ff-only || die "pull error"
 }