diff options
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-pull.sh b/git-pull.sh index 28d08195f0..c184fb81a4 100755 --- 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 |