procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/automerge: Quieten initial reset.

Browse source
This commit is contained in:
Glenn Morris 2018-03-01 21:19:12 -05:00
parent a206ea124c
commit 703fdeec8c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
admin/automerge
View file

@ -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"