Browse Source

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

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 19 years ago
parent
commit
8323124afe
  1. 8
      git-pull.sh

8
git-pull.sh

@ -59,7 +59,13 @@ then @@ -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' \

Loading…
Cancel
Save