summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-22 09:57:11 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-22 09:57:11 (GMT)
commit8323124afe49353e09d041eb8ed3be4c2477c180 (patch)
tree245ce274db5cb4377f23b1fd8fa9bd4b89bdf859 /git-pull.sh
parentcf46e7b8999f25d5d7f2acd64701a100e403ee03 (diff)
downloadgit-8323124afe49353e09d041eb8ed3be4c2477c180.zip
git-8323124afe49353e09d041eb8ed3be4c2477c180.tar.gz
git-8323124afe49353e09d041eb8ed3be4c2477c180.tar.bz2
git-pull: reword "impossible to fast-forward" message.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index d90f7c9..4611ae6 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' \