Merge branch 'ja/shorthelp'

* ja/shorthelp:
help: remove extra blank line after "See 'git --help'" message
On error, do not list all commands, but point to --help option

diff --git a/help.c b/help.c
index 1cd33ece6bcec6f71c6749205c18c0f413034d89..e5662d9014e758fee00b890e06ffc66cd4aa0291 100644 (file)
--- a/help.c
+++ b/help.c
@@ -185,8 +185,7 @@ static void show_man_page(const char *git_cmd)
 
 void help_unknown_cmd(const char *cmd)
 {
-       printf("git: '%s' is not a git-command\n\n", cmd);
-       list_common_cmds_help();
+       fprintf(stderr, "git: '%s' is not a git-command. See 'git --help'.\n", cmd);
        exit(1);
 }