Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> --- git-pull.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index 324ac95..99837dd 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -238,12 +238,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.' +\$ git reset --hard +to recover.")" fi -- 1.7.3.rc1.110.g6776a.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html