[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 703fdee: * admin/automerge: Quieten initial reset.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 703fdee: * admin/automerge: Quieten initial reset. |
Date: |
Thu, 1 Mar 2018 21:19:19 -0500 (EST) |
branch: master
commit 703fdeec8c3039a42d16dba46fcea2c1a4428b75
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* admin/automerge: Quieten initial reset.
---
admin/automerge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/automerge b/admin/automerge
index 520961f..e88711f 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"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 703fdee: * admin/automerge: Quieten initial reset.,
Glenn Morris <=