diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-15 07:45:23 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-15 08:08:00 +0200 |
| commit | 3c486633b75f3ee2d60ca99d84a2045c1c3b2482 (patch) | |
| tree | 1148e6d0aa00de0e9ee3a212de19f5e1f6397db3 /scripts | |
| parent | 094581cdd201a38aeb6943fbb2d965382713be1d (diff) | |
| download | kernel-3c486633b75f3ee2d60ca99d84a2045c1c3b2482.tar.gz kernel-3c486633b75f3ee2d60ca99d84a2045c1c3b2482.tar.xz kernel-3c486633b75f3ee2d60ca99d84a2045c1c3b2482.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 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" |