Merge branch 'js/diff'

diff --git a/git-pull.sh b/git-pull.sh
index d90f7c9676c9519bdf396c28095ee33e36498f29..bdd3939923bb905d561eb3ca88bda729cc93660d 100755 (executable)
--- 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' \
@@ -93,5 +99,5 @@ case "$strategy_args" in
        ;;
 esac
 
-merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
+merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
 git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head