Documentation/git-svn: clarify dcommit, rebase vs pull/merge

[git.git] / git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index 28d08195f0c84b7f3a89a5c5cff9945bb64ddfb3..c184fb81a4dab622d79120bcc986c3bf2b07df7f 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -9,6 +9,9 @@ LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEA
 . git-sh-setup
 set_reflog_action "pull $*"
 
+test -z "$(git ls-files -u)" ||
+       die "You are in a middle of conflicted merge."
+
 strategy_args= no_summary= no_commit= squash=
 while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
 do