diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-22 01:57:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-22 01:57:11 -0800 |
| commit | 8323124afe49353e09d041eb8ed3be4c2477c180 (patch) | |
| tree | 245ce274db5cb4377f23b1fd8fa9bd4b89bdf859 /git-pull.sh | |
| parent | git-pull: further safety while on tracking branch. (diff) | |
| download | tgif-8323124afe49353e09d041eb8ed3be4c2477c180.tar.xz | |
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-x | git-pull.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index d90f7c9676..4611ae644e 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' \ |