X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-revert.sh;h=f9843c7c8ec4c3ae7e796fec801425e85dc1c73d;hb=e861ce1692fa9809f3e7b898804f8ddaf7cd8975;hp=6eab3c72df0db0994a352836018a7fc35ba1eae3;hpb=dc8302d27439b38cb3042b2d1c1106d8ef99e3f2;p=git.git diff --git a/git-revert.sh b/git-revert.sh index 6eab3c72d..f9843c7c8 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -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 '" + echo >&2 "mark the corrected paths with 'git-add '" echo >&2 "and commit the result." case "$me" in cherry-pick)