[PATCH] Show usage string for 'git log -h', 'git show -h' and 'git diff -h'
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:47:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Matthieu Moy <redacted> --- builtin-diff.c | 2 ++ builtin-log.c | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/builtin-diff.c b/builtin-diff.c
index 2e51f40..ffcdd05 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c@@ -218,6 +218,8 @@ static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv revs->max_count = 3; else if (!strcmp(argv[1], "-q")) options |= DIFF_SILENT_ON_REMOVED; + else if (!strcmp(argv[1], "-h")) + usage(builtin_diff_usage); else return error("invalid option: %s", argv[1]); argv++; argc--;
diff --git a/builtin-log.c b/builtin-log.c
index 3035816..3817bf1 100644
--- a/builtin-log.c
+++ b/builtin-log.c@@ -27,6 +27,10 @@ static int default_show_root = 1; static const char *fmt_patch_subject_prefix = "PATCH"; static const char *fmt_pretty; +static const char * const builtin_log_usage = + "git log [<options>] [<since>..<until>] [[--] <path>...]\n" + " or: git show [options] <object>..."; + static void cmd_log_init(int argc, const char **argv, const char *prefix, struct rev_info *rev) {
@@ -61,6 +65,8 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix, rev->show_decorations = 1; } else if (!strcmp(arg, "--source")) { rev->show_source = 1; + } else if (!strcmp(arg, "-h")) { + usage(builtin_log_usage); } else die("unrecognized argument: %s", arg); }
--
1.6.4.55.gc63c6.dirty