[PATCH 15/48] i18n: git-pull eval_gettext + die message
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2016-06-15 22:51:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- git-pull.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index acb0c37..06dcd81 100755
--- a/git-pull.sh
+++ b/git-pull.sh@@ -222,12 +222,12 @@ then echo >&2 "Warning: commit $orig_head." git update-index -q --refresh git read-tree -u -m "$orig_head" "$curr_head" || - die 'Cannot fast-forward your working tree. + die "$(eval_gettext "Cannot fast-forward your working tree. After making sure that you saved anything precious from -$ git diff '$orig_head' +$ git diff \$orig_head output, run $ git reset --hard -to recover.' +to recover.")" fi
--
1.7.4.4