diff options
| author | jaseg <git@jaseg.de> | 2020-11-18 13:42:45 +0100 |
|---|---|---|
| committer | jaseg <git@jaseg.de> | 2020-11-18 13:42:45 +0100 |
| commit | 31f91a75a4049d65d0765c1f513eb02c469344b3 (patch) | |
| tree | b3a8a3feee9404996ccdee9784dc25d566b94b16 /tools | |
| parent | ae624f87c18699ae082fabf9f4193839425af68a (diff) | |
| download | stm32square-31f91a75a4049d65d0765c1f513eb02c469344b3.tar.gz stm32square-31f91a75a4049d65d0765c1f513eb02c469344b3.tar.bz2 stm32square-31f91a75a4049d65d0765c1f513eb02c469344b3.zip | |
do_release.sh: fix branching logic
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/do_release.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/do_release.sh b/tools/do_release.sh index 7bbf609..da5f0fe 100644 --- a/tools/do_release.sh +++ b/tools/do_release.sh @@ -15,8 +15,9 @@ fi TIMESTAMP=${TIMESTAMP:-$(date +%y-%m-%d)} git checkout release -make clean all git merge -X theirs $SOURCE_BRANCH + +make clean all git add svd mx_mcu_db prog_db chip_db git commit --allow-empty -m "STM32Square Auto-Release $TIMESTAMP |