Merge branch 'aw/git-p4-deletion' into maint

diff --git a/builtin/reset.c b/builtin/reset.c
index 1283068fd24c371e39f0271d01dd6b3aac437d4b..0037be4693bbd875e644df13ce4a9fae31e7378c 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -318,7 +318,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
         * affecting the working tree nor HEAD. */
        if (i < argc) {
                if (reset_type == MIXED)
-                       warning("--mixed option is deprecated with paths.");
+                       warning("--mixed with paths is deprecated; use 'git reset -- <paths>' instead.");
                else if (reset_type != NONE)
                        die("Cannot do %s reset with paths.",
                                        reset_type_names[reset_type]);