emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 8156e3f: * admin/automerge: Quieten initial pull if


From: Glenn Morris
Subject: [Emacs-diffs] master 8156e3f: * admin/automerge: Quieten initial pull if start with reset.
Date: Fri, 23 Feb 2018 12:52:24 -0500 (EST)

branch: master
commit 8156e3f3e04e7f9ac1bb2b8acc58153cfaaab2c9
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * admin/automerge: Quieten initial pull if start with reset.
---
 admin/automerge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/automerge b/admin/automerge
index ba608d1..520961f 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"
 }
 
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]