Merge branch 'jc/maint-format-patch-encoding' into maint

[git.git] / builtin-revert.c

diff --git a/builtin-revert.c b/builtin-revert.c
index 499bbe7343a635f1c7fc024ed6a1436042dcb8ac..94e77771d24decc60c50adf0cd3ab272ce36d3f2 100644 (file)
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -264,7 +264,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
                if (get_sha1("HEAD", head))
                        die ("You do not have a valid HEAD");
                wt_status_prepare(&s);
-               if (s.commitable || s.workdir_dirty)
+               if (s.commitable)
                        die ("Dirty index: cannot %s", me);
                discard_cache();
        }
@@ -351,7 +351,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
                        die ("Error wrapping up %s", defmsg);
                fprintf(stderr, "Automatic %s failed.  "
                        "After resolving the conflicts,\n"
-                       "mark the corrected paths with 'git-add <paths>'\n"
+                       "mark the corrected paths with 'git add <paths>' "
                        "and commit the result.\n", me);
                if (action == CHERRY_PICK) {
                        fprintf(stderr, "When commiting, use the option "