diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-15 07:45:23 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-15 07:45:23 +0200 |
| commit | 09923bf385f55a768e5221909e98acc5d23b6819 (patch) | |
| tree | 73290ab7c7684221b8039b748391aa384b05f95b /scripts | |
| parent | b752298355854041051b59db67c5e9d5c2e25ce2 (diff) | |
| download | kernel-09923bf385f55a768e5221909e98acc5d23b6819.tar.gz kernel-09923bf385f55a768e5221909e98acc5d23b6819.tar.xz kernel-09923bf385f55a768e5221909e98acc5d23b6819.zip | |
remove --ff-only
Diffstat (limited to 'scripts')
| -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 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" |