From f2dacddde915f3cf044f46f35b2088cde99cf28f Mon Sep 17 00:00:00 2001
From: Roman Ivanov <ivanov-jr@mail.ru>
Date: Thu, 3 Sep 2015 21:30:38 -0400
Subject: [PATCH] minor: update for --ff-only and fail-fast

---
 fast-forward-merge.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fast-forward-merge.sh b/fast-forward-merge.sh
index d24cf70fe..78eb10e6d 100755
--- a/fast-forward-merge.sh
+++ b/fast-forward-merge.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash 
+set -e
 
 if [ $# -eq 0 ]
   then
@@ -28,7 +29,7 @@ git rebase master
 
 echo "merge to master ..."
 git checkout master
-git merge ${LOCAL_USER_BRANCH}
+git merge ${LOCAL_USER_BRANCH} --ff-only
 
 echo "removing local branch ..."
 git branch -D ${LOCAL_USER_BRANCH}