diff options
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index 29c14e148e..d90f7c9676 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -55,7 +55,9 @@ 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." fi |