From 31f91a75a4049d65d0765c1f513eb02c469344b3 Mon Sep 17 00:00:00 2001
From: jaseg <git@jaseg.de>
Date: Wed, 18 Nov 2020 13:42:45 +0100
Subject: do_release.sh: fix branching logic
---
tools/do_release.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'tools')
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
--
cgit