From dd992600f3f604e34c82cf55dd99662b66e2158c Mon Sep 17 00:00:00 2001
From: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Tue, 29 Dec 2015 20:34:33 +0100
Subject: update.sh: Only allow fast-forwards

---
 update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update.sh b/update.sh
index 44742241..73c37467 100755
--- a/update.sh
+++ b/update.sh
@@ -27,7 +27,7 @@ command -v $POEZIO_VENV_COMMAND > /dev/null 2>&1 || {
 }
 
 echo 'Updating poezio'
-git pull origin master || {
+git pull --ff-only origin master || {
     echo "The script failed to update poezio."
     exit 1
 }
-- 
cgit v1.2.3