git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] pull: add angle brackets to usage string

From
Ralf Thielow <ralf.thielow@gmail.com>
Date
Oct 16, 2015, 17:24 UTC
Message-ID
<20151016172455.GA18751@ralf-ubuntu>
In-Reply-To
<1444962133-1266-1-git-send-email-alexhenrie24@gmail.com>
Alex Henrie <alexhenrie24@gmail.com> wrote:
Show 17 quoted lines
> ---
>  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
Previous: Junio C HamanoNext: Junio C Hamano
Message 9 of 10 in “pull: add angle brackets to usage string”
  1. pull: add angle brackets to usage stringAlex Henrie, Oct 16, 2015
  2. Junio C HamanoOct 16, 2015
  3. Alex HenrieOct 16, 2015
  4. Junio C HamanoOct 16, 2015
  5. Alex HenrieOct 19, 2015
  6. Junio C HamanoOct 20, 2015
  7. Alex HenrieOct 20, 2015
  8. Junio C HamanoOct 20, 2015
  9. Ralf ThielowOct 16, 2015
  10. Junio C HamanoOct 16, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.