diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-10 06:31:07 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-10 06:31:07 +0200 |
commit | 8ee1ab8c124b2156ecff76786c8e8ef232509c4f (patch) | |
tree | 0fe0fd65c9fe57db78dc612a800a387b91fc3910 /scripts | |
parent | cb32fbcf15ae535ea8a8c4bf4f0ba1e161d1157d (diff) | |
parent | c15f4eec8a9df6febec307872718dabeb3c1a1fe (diff) | |
download | kernel-8ee1ab8c124b2156ecff76786c8e8ef232509c4f.tar.gz kernel-8ee1ab8c124b2156ecff76786c8e8ef232509c4f.tar.xz kernel-8ee1ab8c124b2156ecff76786c8e8ef232509c4f.zip |
merge origin
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 c919bf11d..6169d3e86 100755 --- a/scripts/stable-update.sh +++ b/scripts/stable-update.sh @@ -13,7 +13,7 @@ # Args: Stable version to update (e.g. 4.7.7, 4.8.1) # update orgin -~/usr/bin/vanilla-kernel-helper.sh masterupdate +vanilla-kernel-helper.sh masterupdate currentbranch=$(git symbolic-ref --short HEAD) git merge --no-edit origin/${currentbranch%-user-thl-vanilla-fedora} || exit 1 |