From: Junio C Hamano <junkio@cox.net>
Date: Wed, 22 Mar 2006 09:57:11 +0000 (-0800)
Subject: git-pull: reword "impossible to fast-forward" message.
X-Git-Tag: v1.3.0-rc1~10^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=8323124afe49353e09d041eb8ed3be4c2477c180;p=git.git

git-pull: reword "impossible to fast-forward" message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

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' \