diff options
| author | Joseph Herlant <aerostitch@users.noreply.github.com> | 2018-05-24 06:01:16 -0700 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2018-05-24 15:01:16 +0200 |
| commit | 2523dd28f42214ddf83367873b3163225045df3c (patch) | |
| tree | 526972dcff39caca70d887bf3184f8796e2accba /scripts/merge_i18n_update.sh | |
| parent | 01f62133c96e24b8b7df516007d7ef62af3a5759 (diff) | |
| download | navit-2523dd28f42214ddf83367873b3163225045df3c.tar.gz | |
change:ci:rename ci folder to scripts (#593)
Diffstat (limited to 'scripts/merge_i18n_update.sh')
| -rw-r--r-- | scripts/merge_i18n_update.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/scripts/merge_i18n_update.sh b/scripts/merge_i18n_update.sh new file mode 100644 index 000000000..5fb42d56e --- /dev/null +++ b/scripts/merge_i18n_update.sh @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +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 pull +git merge --squash ${CIRCLE_BRANCH} +git commit -m "${message}" +git push |