X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=4611ae644e08e4ab115633ab86f1f02976663169;hb=fb6a9f93d39e4e5fdb83673a927f71a34e9fb7c0;hp=d90f7c9676c9519bdf396c28095ee33e36498f29;hpb=cf46e7b8999f25d5d7f2acd64701a100e403ee03;p=git.git

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