diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2010-08-15 08:43:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:17:35 -0700 |
| commit | a4941a81c8a67abad2000b044ecad71ceff9d695 (patch) | |
| tree | 5d189c56ba326886d31f57ff825ab4ba7f583cef /builtin/reset.c | |
| parent | 452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e (diff) | |
| download | git-a4941a81c8a67abad2000b044ecad71ceff9d695.tar.gz git-a4941a81c8a67abad2000b044ecad71ceff9d695.tar.xz | |
reset: suggest what to do upon "git reset --mixed <paths>"
When you call "git reset --mixed <paths>" git will warn that using mixed
with paths is deprecated:
warning: --mixed option is deprecated with paths.
That doesn't tell the user what he should use instead. Expand on the
warning and tell the user to just omit --mixed:
warning: --mixed with paths is deprecated; use 'git reset -- <paths>' instead
The exact wording of the warning was suggested by Jonathan Nieder.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/reset.c')
| -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 1283068fd..0037be469 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]); |