summaryrefslogtreecommitdiffstats
path: root/import-translations
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-11-30 15:00:03 +0000
committerTails developers <amnesia@boum.org>2013-11-30 15:00:03 +0000
commitd5c2ca6735a6ae304352cd6875e2583aac619089 (patch)
tree5007ceed24f580817bba6ebafff9118300a0e886 /import-translations
parent31270e933bc1ace06d12c758b97a3b690c14873e (diff)
Reset --hard instead of merging, just in case TTP rewrite their history some day.
Diffstat (limited to 'import-translations')
-rwxr-xr-ximport-translations2
1 files changed, 1 insertions, 1 deletions
diff --git a/import-translations b/import-translations
index dd9a4c0..cf90bfa 100755
--- a/import-translations
+++ b/import-translations
@@ -26,7 +26,7 @@ fi
# Checkout the correct branch
$GIT_IN_TOR_TRANSLATION_DIR checkout tails-misc_completed
-$GIT_IN_TOR_TRANSLATION_DIR merge origin/tails-misc_completed
+$GIT_IN_TOR_TRANSLATION_DIR reset --hard origin/tails-misc_completed
# For each completely translated language, merge it,
# unless it is translated outside Transifex