From: Ævar Arnfjörð Bjarmason Date: Sun, 03 Apr 2011 16:45:38 GMT Subject: [PATCH 14/51] i18n: git-pull eval_gettext + die message Message-ID: <1301849175-1697-15-git-send-email-avarab@gmail.com> In-Reply-To: <1301849175-1697-1-git-send-email-avarab@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason --- git-pull.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index b19e097..36f34d6 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -244,12 +244,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.1