Print info about "git help COMMAND" on git's main usage pages

Git's main usage pages did not show "git help" as a way to get more
information on a specific subcommand. This patch adds an info line after
the list of git commands currently printed by "git", "git help", "git
--help" and "git help --all".

Signed-off-by: Teemu Likonen <tlikonen@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin.h b/builtin.h
index 8bda1117e4c56b38ac799f60d39310ffc51b9b63..b460b2da6f41797ca3190646eb3fe5cafd1abd84 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -5,6 +5,7 @@
 
 extern const char git_version_string[];
 extern const char git_usage_string[];
 
 extern const char git_version_string[];
 extern const char git_usage_string[];

+extern const char git_more_info_string[];

 
 extern void list_common_cmds_help(void);
 extern void help_unknown_cmd(const char *cmd);
 
 extern void list_common_cmds_help(void);
 extern void help_unknown_cmd(const char *cmd);

diff --git a/git.c b/git.c
index 272bf03da3b3aee7dbdb088ddc1042c18567492a..15a0e71cc1f5d7ad032a2b0591e526f9b0ca8b0b 100644 (file)
--- a/git.c
+++ b/git.c
@@ -6,6 +6,9 @@
 const char git_usage_string[] =
        "git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate|--no-pager] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]";
 
 const char git_usage_string[] =
        "git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate|--no-pager] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]";
 

+const char git_more_info_string[] =
+       "See 'git help COMMAND' for more information on a specific command.";
+

 static int handle_options(const char*** argv, int* argc, int* envchanged)
 {
        int handled = 0;
 static int handle_options(const char*** argv, int* argc, int* envchanged)
 {
        int handled = 0;


@@ -427,6 +430,7 @@ int main(int argc, const char **argv)
                /* The user didn't specify a command; give them help */
                printf("usage: %s\n\n", git_usage_string);
                list_common_cmds_help();
                /* The user didn't specify a command; give them help */
                printf("usage: %s\n\n", git_usage_string);
                list_common_cmds_help();

+               printf("\n%s\n", git_more_info_string);

                exit(1);
        }
        cmd = argv[0];
                exit(1);
        }
        cmd = argv[0];

diff --git a/help.c b/help.c
index d89d43796f3ee9d3689131d48861967048f5c5d7..8aff94c64a1204f8a359e522a554f29c8f0fdc20 100644 (file)
--- a/help.c
+++ b/help.c
@@ -649,12 +649,14 @@ int cmd_help(int argc, const char **argv, const char *prefix)
        if (show_all) {
                printf("usage: %s\n\n", git_usage_string);
                list_commands();
        if (show_all) {
                printf("usage: %s\n\n", git_usage_string);
                list_commands();

+               printf("%s\n", git_more_info_string);

                return 0;
        }
 
        if (!argv[0]) {
                printf("usage: %s\n\n", git_usage_string);
                list_common_cmds_help();
                return 0;
        }
 
        if (!argv[0]) {
                printf("usage: %s\n\n", git_usage_string);
                list_common_cmds_help();

+               printf("\n%s\n", git_more_info_string);

                return 0;
        }
 
                return 0;
        }