From 09923bf385f55a768e5221909e98acc5d23b6819 Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <fedora@leemhuis.info>
Date: Sun, 15 Apr 2018 07:45:23 +0200
Subject: remove --ff-only

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

(limited to 'scripts/stable-update.sh')

diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh
index 53607f004..5a10d1e7c 100755
--- a/scripts/stable-update.sh
+++ b/scripts/stable-update.sh
@@ -16,7 +16,7 @@
 # update orgin
 ~/usr/bin/vanilla-kernel-helper.sh masterupdate
 currentbranch=$(git symbolic-ref --short HEAD)
-git merge --no-edit --ff-only origin/${currentbranch%-user-thl-vanilla-fedora} || exit 1
+git merge --no-edit origin/${currentbranch%-user-thl-vanilla-fedora} || exit 1
 
 if [ $# -lt 1 ]; then
 	echo "Need a version"
-- 
cgit