diff options
| author | Simon Wisselink <s.wisselink@iwink.nl> | 2024-04-05 22:40:31 +0200 |
|---|---|---|
| committer | Simon Wisselink <s.wisselink@iwink.nl> | 2024-04-05 22:40:31 +0200 |
| commit | 5400b53edf17c8cb56b65852d6d077943aefc87e (patch) | |
| tree | f278585d6d3c7b61aa208ae2adabc09cc4226664 | |
| parent | 599bcee13ea7b305876191241be920a1c0fcf9b5 (diff) | |
| download | smarty-5400b53edf17c8cb56b65852d6d077943aefc87e.tar.gz smarty-5400b53edf17c8cb56b65852d6d077943aefc87e.tar.bz2 smarty-5400b53edf17c8cb56b65852d6d077943aefc87e.zip | |
Revert "fix release tooling to support/5 branch"
This reverts commit 569cef71d0fc45aeed260170c4ad66626d791161.
| -rwxr-xr-x | make-release.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make-release.sh b/make-release.sh index a5e9ffde..2b6db0d7 100755 --- a/make-release.sh +++ b/make-release.sh @@ -15,7 +15,7 @@ php utilities/update-smarty-version-number.php $1 git add changelog CHANGELOG.md src/Smarty.php git commit -m "version bump" -git checkout support/5 +git checkout master git pull git merge --no-ff "release/$1" git branch -d "release/$1" |