aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorjaseg <git@jaseg.de>2020-11-18 13:56:12 +0100
committerjaseg <git@jaseg.de>2020-11-18 13:56:12 +0100
commit50b5c7aa5f1f1860781e1f9a39d5a590b64959e9 (patch)
tree00372b804b0efbd5eb48b10367e7ce1b57a5cf01 /tools
parent620fc833e3e307f5ad3b04c5bc4101d71673c7cb (diff)
downloadstm32square-50b5c7aa5f1f1860781e1f9a39d5a590b64959e9.tar.gz
stm32square-50b5c7aa5f1f1860781e1f9a39d5a590b64959e9.tar.bz2
stm32square-50b5c7aa5f1f1860781e1f9a39d5a590b64959e9.zip
do_relase.sh: One more branching logic fix
Diffstat (limited to 'tools')
-rw-r--r--tools/do_release.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/do_release.sh b/tools/do_release.sh
index ad7bba3..bd4f087 100644
--- a/tools/do_release.sh
+++ b/tools/do_release.sh
@@ -13,7 +13,7 @@ fi
TIMESTAMP=${TIMESTAMP:-$(date +%y-%m-%d)}
-git pull -X theirs --no-commit master
+#git pull -X theirs --no-commit master
make clean all
git add svd mx_mcu_db prog_db chip_db