diff options
| author | jaseg <git@jaseg.de> | 2020-11-18 13:45:47 +0100 |
|---|---|---|
| committer | jaseg <git@jaseg.de> | 2020-11-18 13:45:47 +0100 |
| commit | 68497cc5f1016710cf213de7849e96ae6147d13d (patch) | |
| tree | f838bbe61b9ad04e56af1987dc671c6aa3921f86 | |
| parent | 31f91a75a4049d65d0765c1f513eb02c469344b3 (diff) | |
| download | stm32square-68497cc5f1016710cf213de7849e96ae6147d13d.tar.gz stm32square-68497cc5f1016710cf213de7849e96ae6147d13d.tar.bz2 stm32square-68497cc5f1016710cf213de7849e96ae6147d13d.zip | |
do_release.sh: Fix branching logic
| -rw-r--r-- | tools/do_release.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/do_release.sh b/tools/do_release.sh index da5f0fe..3bcacb1 100644 --- a/tools/do_release.sh +++ b/tools/do_release.sh @@ -1,7 +1,6 @@ #!/bin/sh set -e -SOURCE_BRANCH=$(git rev-parse --abbrev-ref HEAD) RELEASE_TRIGGER=${RELEASE_TRIGGER:-"Manual command-line makefile invocation"} set -x GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME:-'STM32Square Auto-Release Script'} @@ -15,7 +14,7 @@ fi TIMESTAMP=${TIMESTAMP:-$(date +%y-%m-%d)} git checkout release -git merge -X theirs $SOURCE_BRANCH +git merge -X theirs --no-commit master make clean all git add svd mx_mcu_db prog_db chip_db |