Skip to content
Snippets Groups Projects
Commit 2f82837b authored by Mike McQuaid's avatar Mike McQuaid Committed by GitHub
Browse files

Merge pull request #1121 from MikeMcQuaid/update-stable-branch

update.sh: always use stable branch for tags.
parents 162bfee9 22299cff
No related branches found
No related tags found
No related merge requests found
......@@ -225,7 +225,7 @@ merge_or_rebase() {
if [ -n "$UPSTREAM_TAG" ]
then
REMOTE_REF="refs/tags/$UPSTREAM_TAG"
UPSTREAM_BRANCH="v$UPSTREAM_TAG"
UPSTREAM_BRANCH="stable"
else
REMOTE_REF="origin/$UPSTREAM_BRANCH"
fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment