Merge git://git.kernel.org/pub/scm/gitk/gitk
[gitweb.git] / git-pull.sh
index 29c14e148e1ff5b6f7bc0d8aca705961f0957eb8..4611ae644e08e4ab115633ab86f1f02976663169 100755 (executable)
@@ -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' \