From 8323124afe49353e09d041eb8ed3be4c2477c180 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 22 Mar 2006 01:57:11 -0800 Subject: [PATCH] git-pull: reword "impossible to fast-forward" message. Signed-off-by: Junio C Hamano --- git-pull.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git-pull.sh b/git-pull.sh index d90f7c96..4611ae64 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -59,7 +59,13 @@ then echo >&2 "Warning: $orig_head commit." git-update-index --refresh 2>/dev/null git-read-tree -u -m "$orig_head" "$curr_head" || - die "You need to first update your working tree." + die 'Cannot fast-forward your working tree. +After making sure that you saved anything precious from +$ git diff '$orig_head' +output, run +$ git reset --hard +to recover.' + fi merge_head=$(sed -e '/ not-for-merge /d' \ -- 2.11.0