Browse Source

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>"
maint
Junio C Hamano 14 years ago
parent
commit
0c1c798f20
  1. 2
      builtin/reset.c

2
builtin/reset.c

@ -318,7 +318,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) @@ -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]);

Loading…
Cancel
Save