2019-04-12 08:31:37 +00:00
|
|
|
#!/bin/bash
|
|
|
|
|
|
|
|
git checkout l10n_master
|
|
|
|
git reset --hard HEAD~200
|
2019-04-12 08:38:43 +00:00
|
|
|
git pull http l10n_master
|
2019-04-12 08:31:37 +00:00
|
|
|
git rebase master
|
|
|
|
git reset --soft master
|
|
|
|
git commit -m "new translations from crowdin"
|
|
|
|
git checkout master
|
2019-04-12 08:45:51 +00:00
|
|
|
git merge l10n_master
|
|
|
|
echo "MERGE DONE"
|