diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:33:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:33:50 -0700 |
| commit | 6588f82ff6aa8ff7857304c10b18ab062e67bb52 (patch) | |
| tree | 66d1ad7a324b50b07c8533c72cd3c1152f370a50 | |
| parent | afd647c55f19b34c1c605f099720dcec49c4e24a (diff) | |
| parent | ce41720cad79d858f09ebfc88cf84a4b152645c7 (diff) | |
| download | git-6588f82ff6aa8ff7857304c10b18ab062e67bb52.tar.gz | |
Merge branch 'ah/usage-strings' into maint
A few usage string updates.
* ah/usage-strings:
blame, log: format usage strings similarly to those in documentation
| -rw-r--r-- | builtin/blame.c | 2 | ||||
| -rw-r--r-- | builtin/log.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index ff978253f1..b3e948e757 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -28,7 +28,7 @@ #include "line-log.h" #include "dir.h" -static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] file"); +static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"); static const char *blame_opt_usage[] = { blame_usage, diff --git a/builtin/log.c b/builtin/log.c index dd8f3fcfc4..4c4e6be28c 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -38,7 +38,7 @@ static const char *fmt_patch_subject_prefix = "PATCH"; static const char *fmt_pretty; static const char * const builtin_log_usage[] = { - N_("git log [<options>] [<revision range>] [[--] <path>...]"), + N_("git log [<options>] [<revision-range>] [[--] <path>...]"), N_("git show [<options>] <object>..."), NULL }; |