]> git.eshelyaron.com Git - emacs.git/commitdiff
* admin/automerge: Quieten initial reset.
authorGlenn Morris <rgm@gnu.org>
Fri, 2 Mar 2018 02:19:12 +0000 (21:19 -0500)
committerGlenn Morris <rgm@gnu.org>
Fri, 2 Mar 2018 02:19:12 +0000 (21:19 -0500)
admin/automerge

index 520961f1e884be8c4d2cf8992dc9feadf2ee4cd4..e88711f8d6dd0b37be4214d3225bafd1eee8c98f 100755 (executable)
@@ -138,7 +138,7 @@ trap "rm -f $tempfile 2> /dev/null" EXIT
 
 [ "$reset" ] && {
     echo "Resetting..."
-    git reset --hard origin/master || die "reset error"
+    git reset -q --hard origin/master || die "reset error"
 
     echo "Pulling..."
     git pull -q --ff-only || die "pull error"