undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* ab/maint-reset-mixed-w-pathspec-advice:
  reset: suggest what to do upon "git reset --mixed <paths>"
This commit is contained in:
Junio C Hamano 2010-08-31 16:24:36 -07:00
commit 0c1c798f20
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/reset.c
View File

@ -318,7 +318,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
* affecting the working tree nor HEAD. */ * affecting the working tree nor HEAD. */
if (i < argc) { if (i < argc) {
if (reset_type == MIXED) 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) else if (reset_type != NONE)
die("Cannot do %s reset with paths.", die("Cannot do %s reset with paths.",
reset_type_names[reset_type]); reset_type_names[reset_type]);