f.weber/jekyll-theme-chirpy
Template
1
0
Fork 0
mirror of https://github.com/cotes2020/jekyll-theme-chirpy.git synced 2025-12-31 12:02:44 +00:00
Code Issues Packages Releases Activity

Merge branch 'hotfix/4.2.1'

Browse Source
This commit is contained in:
Cotes Chung
2021-09-16 21:01:16 +08:00
parent d761d340a8
commit 20d72b65ed
11 changed files with 104 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/bump.sh
View File

@@ -128,10 +128,12 @@ release() {
git checkout -b "$_release_branch"
_new_release_branch=true
else
# cherry-pick the latest commit from default branch to release branch
_last_commit="$(git rev-parse $DEFAULT_BRANCH)"
git checkout "$_release_branch"
# cherry-pick the latest commit from master branch to release branch
git cherry-pick "$(git rev-parse $DEFAULT_BRANCH)"
git cherry-pick "$_last_commit" -m 1
fi
fi
echo -e "Bump version to $_version\n"