summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-16 21:33:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-16 21:33:50 (GMT)
commit6588f82ff6aa8ff7857304c10b18ab062e67bb52 (patch)
tree66d1ad7a324b50b07c8533c72cd3c1152f370a50 /builtin
parentafd647c55f19b34c1c605f099720dcec49c4e24a (diff)
parentce41720cad79d858f09ebfc88cf84a4b152645c7 (diff)
downloadgit-6588f82ff6aa8ff7857304c10b18ab062e67bb52.zip
git-6588f82ff6aa8ff7857304c10b18ab062e67bb52.tar.gz
git-6588f82ff6aa8ff7857304c10b18ab062e67bb52.tar.bz2
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
Diffstat (limited to 'builtin')
-rw-r--r--builtin/blame.c2
-rw-r--r--builtin/log.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index ff97825..b3e948e 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 dd8f3fc..4c4e6be 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
};