diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-03-01 21:19:12 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-01 21:19:12 -0500 |
| commit | 703fdeec8c3039a42d16dba46fcea2c1a4428b75 (patch) | |
| tree | 21a014a0087d7d93cb262b667945127600d68818 /admin | |
| parent | a206ea124c7ea679ea7e60ee3d4f83e931aec4e9 (diff) | |
| download | emacs-703fdeec8c3039a42d16dba46fcea2c1a4428b75.tar.gz | |
* admin/automerge: Quieten initial reset.
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/automerge | 2 |
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 [ "$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" |