projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
088b1b8
)
* admin/automerge: Quieten initial pull if start with reset.
author
Glenn Morris
<rgm@gnu.org>
Fri, 23 Feb 2018 17:52:11 +0000
(12:52 -0500)
committer
Glenn Morris
<rgm@gnu.org>
Fri, 23 Feb 2018 17:52:11 +0000
(12:52 -0500)
admin/automerge
patch
|
blob
|
history
diff --git
a/admin/automerge
b/admin/automerge
index ba608d10904befaefb73c2e2bb6e7a2cf51b8296..520961f1e884be8c4d2cf8992dc9feadf2ee4cd4 100755
(executable)
--- 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"
}