diff options
| -rwxr-xr-x | scripts/stable-update.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh index cd3595a7c..278eb2ee0 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" |