Code

Merge branch 'jc/bare'
[git.git] / git-revert.sh
index 6eab3c72df0db0994a352836018a7fc35ba1eae3..f9843c7c8ec4c3ae7e796fec801425e85dc1c73d 100755 (executable)
@@ -19,6 +19,7 @@ case "$0" in
        die "What are you talking about?" ;;
 esac
 . git-sh-setup
+require_work_tree
 
 no_commit=
 while case "$#" in 0) break ;; esac
@@ -155,7 +156,7 @@ Conflicts:
                uniq
            } >>"$GIT_DIR/MERGE_MSG"
            echo >&2 "Automatic $me failed.  After resolving the conflicts,"
-           echo >&2 "mark the corrected paths with 'git-update-index <paths>'"
+           echo >&2 "mark the corrected paths with 'git-add <paths>'"
            echo >&2 "and commit the result."
            case "$me" in
            cherry-pick)