Skip to content

Commit

Permalink
git-pull: reword "impossible to fast-forward" message.
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Mar 22, 2006
1 parent cf46e7b commit 8323124
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion git-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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' \
Expand Down

0 comments on commit 8323124

Please sign in to comment.