Re: [PATCH] pull: add angle brackets to usage string
From: Ralf Thielow <hidden>
Date: 2016-06-15 23:06:53
Subsystem:
the rest · Maintainer:
Linus Torvalds
Alex Henrie [off-list ref] wrote:
quoted hunk ↗ jump to hunk
--- builtin/pull.c | 2 +- contrib/examples/git-pull.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)diff --git a/builtin/pull.c b/builtin/pull.c index a39bb0a..bf3fd3f 100644 --- a/builtin/pull.c +++ b/builtin/pull.c@@ -66,7 +66,7 @@ static int parse_opt_rebase(const struct option *opt, const char *arg, int unset } static const char * const pull_usage[] = { - N_("git pull [options] [<repository> [<refspec>...]]"), + N_("git pull [<options>] [<repository> [<refspec>...]]"), NULL };
There seem to be three more places left missing these angle brances at the usage string. Junio, feel free to squash this or treat it as a separate patch on top, if suitable. -- >8 -- From: Ralf Thielow <redacted> Date: Fri, 16 Oct 2015 19:09:57 +0200 Subject: [PATCH] am, credential-cache: add angle brackets to usage string Signed-off-by: Ralf Thielow <redacted> --- builtin/am.c | 4 ++-- credential-cache.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 4f77e07..98992cd 100644
--- a/builtin/am.c
+++ b/builtin/am.c@@ -2218,8 +2218,8 @@ int cmd_am(int argc, const char **argv, const char *prefix) int in_progress; const char * const usage[] = { - N_("git am [options] [(<mbox>|<Maildir>)...]"), - N_("git am [options] (--continue | --skip | --abort)"), + N_("git am [<options>] [(<mbox>|<Maildir>)...]"), + N_("git am [<options>] (--continue | --skip | --abort)"), NULL };
diff --git a/credential-cache.c b/credential-cache.c
index 8689a15..f4afdc6 100644
--- a/credential-cache.c
+++ b/credential-cache.c@@ -88,7 +88,7 @@ int main(int argc, const char **argv) int timeout = 900; const char *op; const char * const usage[] = { - "git credential-cache [options] <action>", + "git credential-cache [<options>] <action>", NULL }; struct option options[] = {
--
2.6.1.339.g81d1034