aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xadmin/automerge2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/automerge b/admin/automerge
index 520961f1e88..e88711f8d6d 100755
--- a/admin/automerge
+++ b/admin/automerge
@@ -138,7 +138,7 @@ trap "rm -f $tempfile 2> /dev/null" EXIT
138 138
139[ "$reset" ] && { 139[ "$reset" ] && {
140 echo "Resetting..." 140 echo "Resetting..."
141 git reset --hard origin/master || die "reset error" 141 git reset -q --hard origin/master || die "reset error"
142 142
143 echo "Pulling..." 143 echo "Pulling..."
144 git pull -q --ff-only || die "pull error" 144 git pull -q --ff-only || die "pull error"