aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/do_release.sh3
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