git-pull: reword "impossible to fast-forward" message.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Mar 22, 2006 at 01:57 UTC
8323124afe49353e09d041eb8ed3be4c2477c180
1 file changed
+7
-1
git-pull.sh
+7
-1
@@ -59,7 +59,13 @@ then
59
echo >&2 "Warning: $orig_head commit."
60
git-update-index --refresh 2>/dev/null
61
git-read-tree -u -m "$orig_head" "$curr_head" ||
62
- die "You need to first update your working tree."
62
+ die 'Cannot fast-forward your working tree.
63
+After making sure that you saved anything precious from
64
+$ git diff '$orig_head'
65
+output, run
66
+$ git reset --hard
67
+to recover.'
68
+
69
fi
70
71
merge_head=$(sed -e '/ not-for-merge /d' \