diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-05-21 18:43:56 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-21 11:57:15 -0700 |
| commit | 9f35aaa917455dee3d205fc28e549a3c640fb448 (patch) | |
| tree | ce7c38792d4a914f9a05c02156e5ef76091ecd77 /git-pull.sh | |
| parent | 85af5f82a67f87c7c6054572729a48d2182c72d4 (diff) | |
| download | git-9f35aaa917455dee3d205fc28e549a3c640fb448.tar.gz | |
i18n: git-pull eval_gettext + die message
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-pull.sh b/git-pull.sh index acb0c37731..06dcd81b02 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 |