diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-23 23:47:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-23 23:47:32 -0800 |
| commit | bdaa085f8c33e75cf477ff6b4292f35c9c5f4c22 (patch) | |
| tree | d86399b24c7f85c94664b114037512bc9cbdc66e | |
| parent | 9bc8b776c54e9b4c3b753639b4ae70acb2ff8db6 (diff) | |
| parent | 8323124afe49353e09d041eb8ed3be4c2477c180 (diff) | |
| download | git-bdaa085f8c33e75cf477ff6b4292f35c9c5f4c22.tar.gz git-bdaa085f8c33e75cf477ff6b4292f35c9c5f4c22.tar.xz | |
Merge branch 'jc/pull'
* 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 29c14e148..4611ae644 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' \ |