From: Ralf Thielow <ralf.thielow@gmail.com>
To: Alex Henrie <alexhenrie24@gmail.com>, gitster@pobox.com
Cc: pyokagan@gmail.com, git@vger.kernel.org
Subject: Re: [PATCH] pull: add angle brackets to usage string
Date: Fri, 16 Oct 2015 19:24:55 +0200 [thread overview]
Message-ID: <20151016172455.GA18751@ralf-ubuntu> (raw)
In-Reply-To: <1444962133-1266-1-git-send-email-alexhenrie24@gmail.com>
Alex Henrie <alexhenrie24@gmail.com> wrote:
> ---
> 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 <ralf.thielow@gmail.com>
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 <ralf.thielow@gmail.com>
---
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
next prev parent reply other threads:[~2015-10-16 17:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-16 2:22 [PATCH] pull: add angle brackets to usage string Alex Henrie
2015-10-16 16:36 ` Junio C Hamano
2015-10-16 16:42 ` Alex Henrie
2015-10-16 17:42 ` Junio C Hamano
2015-10-19 17:27 ` Alex Henrie
2015-10-20 5:17 ` Junio C Hamano
2015-10-20 16:54 ` Alex Henrie
2015-10-20 18:18 ` Junio C Hamano
2015-10-16 17:24 ` Ralf Thielow [this message]
2015-10-16 17:46 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151016172455.GA18751@ralf-ubuntu \
--to=ralf.thielow@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).