From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Aug 2010 23:24:36 +0000 (-0700)
Subject: Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'
X-Git-Tag: v1.7.3-rc0~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0c1c798f20bb9956312247e091b23ba2e7baf7b4?hp=381b2e76985de1c3670ec3c1938fef679c6eef17

Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'

* ab/maint-reset-mixed-w-pathspec-advice:
reset: suggest what to do upon "git reset --mixed <paths>"
---

diff --git a/builtin/reset.c b/builtin/reset.c
index 1283068fd2..0037be4693 100644
--- 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]);