diff options
Diffstat (limited to 'ci/merge_i18n_update.sh')
| -rw-r--r-- | ci/merge_i18n_update.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/merge_i18n_update.sh b/ci/merge_i18n_update.sh index be9fa7759..1943b27e4 100644 --- a/ci/merge_i18n_update.sh +++ b/ci/merge_i18n_update.sh @@ -3,6 +3,7 @@ git config --global user.name "CircleCI" git config --global user.email circleci@navit-project.org git rebase trunk git checkout trunk +git pull git merge --squash ${CIRCLE_BRANCH} -git commit -m ${message} +git commit -m "${message}" git push |