Merge branch 'jc/bare'

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index 477002910ede7f6bc6bcb9a79f6ddebd248f6bd2..3eef048efc7a848145697e205d154c92f8c7ec0f 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -7,6 +7,7 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commi
 
 . git-sh-setup
 set_reflog_action "merge $*"
+require_work_tree
 
 test -z "$(git ls-files -u)" ||
        die "You are in a middle of conflicted merge."