diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-01 03:24:36 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-01 03:24:36 +0400 |
| commit | 0c1c798f20bb9956312247e091b23ba2e7baf7b4 (patch) | |
| tree | 12b43d46354884c0178f6be69f774ccbaff12d09 /builtin | |
| parent | 381b2e76985de1c3670ec3c1938fef679c6eef17 (diff) | |
| parent | a4941a81c8a67abad2000b044ecad71ceff9d695 (diff) | |
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>"
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
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]); |