diff options
| -rw-r--r-- | ci/merge_i18n_update.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ci/merge_i18n_update.sh b/ci/merge_i18n_update.sh index 2d62cf0ad..be9fa7759 100644 --- a/ci/merge_i18n_update.sh +++ b/ci/merge_i18n_update.sh @@ -1,4 +1,8 @@ -git rebase master -git checkout master +message=`git log -1 --pretty=%B` +git config --global user.name "CircleCI" +git config --global user.email circleci@navit-project.org +git rebase trunk +git checkout trunk git merge --squash ${CIRCLE_BRANCH} -git commit +git commit -m ${message} +git push |