diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-22 12:57:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-22 12:57:24 +0300 |
| commit | dcd0409fc545e881a61f522eb8f1d1a7e814eb94 (patch) | |
| tree | 2ed0008ffb49a645cc46af10c72e069f71fc50cb | |
| parent | 8ff8eea016f27d22d0264b140843470c7f14e004 (diff) | |
| parent | 8323124afe49353e09d041eb8ed3be4c2477c180 (diff) | |
Merge branch 'jc/pull' into next
* jc/pull:
git-pull: reword "impossible to fast-forward" message.
git-pull: further safety while on tracking branch.
| -rwxr-xr-x | git-pull.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh index 29c14e148e..4611ae644e 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -55,9 +55,17 @@ then # First update the working tree to match $curr_head. echo >&2 "Warning: fetch updated the current branch head." - echo >&2 "Warning: fast forwarding your working tree." + echo >&2 "Warning: fast forwarding your working tree from" + 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' \ |