diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-09-21 07:55:20 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-09-21 07:55:20 +0200 |
| commit | e71b3d03a178c3e250b38a234b4af211540a7655 (patch) | |
| tree | f7fce7882d40d051ebe1d7b1ff5e0dd85a5e14c6 | |
| parent | 485788f45d203050bb14234a4d6e215b5a651a58 (diff) | |
| download | kernel-e71b3d03a178c3e250b38a234b4af211540a7655.tar.gz kernel-e71b3d03a178c3e250b38a234b4af211540a7655.tar.xz kernel-e71b3d03a178c3e250b38a234b4af211540a7655.zip | |
no automatic merges for transition branchkernel-5.3.1-150.vanilla.knurd.1.fc30kernel-5.3.1-150.vanilla.knurd.1.fc29
| -rwxr-xr-x | scripts/stable-update.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh index edfe70713..40fede23b 100755 --- a/scripts/stable-update.sh +++ b/scripts/stable-update.sh @@ -13,9 +13,9 @@ # Args: Stable version to update (e.g. 4.7.7, 4.8.1) # update orgin -~/usr/bin/vanilla-kernel-helper.sh masterupdate -currentbranch=$(git symbolic-ref --short HEAD) -git merge --no-edit origin/${currentbranch%-user-thl-vanilla-fedora} || exit 1 +#~/usr/bin/vanilla-kernel-helper.sh masterupdate +#currentbranch=$(git symbolic-ref --short HEAD) +#git merge --no-edit origin/${currentbranch%-user-thl-vanilla-fedora} || exit 1 if [ $# -lt 1 ]; then echo "Need a version" |