Merge branch 'nd/commit-a-with-paths-msg-update'
The message given when "git commit -a <paths>" errors out has been updated. * nd/commit-a-with-paths-msg-update: commit: improve error message in "-a <paths>" case
This commit is contained in:
commit
e313c768e0
@ -1194,7 +1194,8 @@ static int parse_and_validate_options(int argc, const char *argv[],
|
|||||||
handle_untracked_files_arg(s);
|
handle_untracked_files_arg(s);
|
||||||
|
|
||||||
if (all && argc > 0)
|
if (all && argc > 0)
|
||||||
die(_("Paths with -a does not make sense."));
|
die(_("paths '%s ...' with -a does not make sense"),
|
||||||
|
argv[0]);
|
||||||
|
|
||||||
if (status_format != STATUS_FORMAT_NONE)
|
if (status_format != STATUS_FORMAT_NONE)
|
||||||
dry_run = 1;
|
dry_run = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user