diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-12-08 23:13:12 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-12-08 23:13:12 +0000 |
| commit | da4b07d6ea6d67ab61031f205043729efa9a8af8 (patch) | |
| tree | 7534307e75e90ecfe7a794d48f7983d976d81f56 | |
| parent | 3083a7cc86dfa8cae029361952d725d41a5347a0 (diff) | |
| download | navit-da4b07d6ea6d67ab61031f205043729efa9a8af8.tar.gz | |
Fix:i18n:Rebase i18n updates against trunk, not masterR7135
| -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 |