From 9043130bf0335d3cb261263f9c4d5d447afd092d Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sat, 30 Nov 2013 15:00:03 +0000 Subject: [PATCH] Reset --hard instead of merging, just in case TTP rewrite their history some day. --- import-translations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/import-translations b/import-translations index dd9a4c02a12..cf90bfa727b 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 -- 2.11.4.GIT