diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-02-23 12:52:11 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-02-23 12:52:11 -0500 |
| commit | 8156e3f3e04e7f9ac1bb2b8acc58153cfaaab2c9 (patch) | |
| tree | f458d15c3f41ba26cf172384b9d0aad45c03d044 /admin | |
| parent | 088b1b864c3e6f3962636f5c2308608d01097c39 (diff) | |
| download | emacs-8156e3f3e04e7f9ac1bb2b8acc58153cfaaab2c9.tar.gz | |
* admin/automerge: Quieten initial pull if start with 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 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" } |