git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"John Cai" <johncai86@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 5/8] git reflog [expire|delete]: make -h output consistent with SYNOPSIS
Date: Thu, 17 Mar 2022 19:08:37 +0100	[thread overview]
Message-ID: <patch-5.8-130e718722b-20220317T180439Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.8-00000000000-20220317T180439Z-avarab@gmail.com>

Make use of the guaranteed pretty alignment of "-h" output added in my
4631cfc20bd (parse-options: properly align continued usage output,
2021-09-21) and wrap and format the "git reflog [expire|delete] -h"
usage output. Also add the missing "--single-worktree" option, as well
as adding other things that were in the SYNOPSIS output, but not in
the "-h" output.

This was last touched in 33d7bdd6459 (builtin/reflog.c: use
parse-options api for expire, delete subcommands, 2022-01-06), but in
that commit the previous usage() output was faithfully
reproduced. Let's follow-up on that and make this even easier to read.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 builtin/reflog.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 25313d504a9..458764400b5 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -6,14 +6,13 @@
 #include "reflog.h"
 
 #define BUILTIN_REFLOG_EXPIRE_USAGE \
-	N_("git reflog expire [--expire=<time>] " \
-	   "[--expire-unreachable=<time>] " \
-	   "[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] " \
-	   "[--verbose] [--all] <refs>...")
+	N_("git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" \
+	   "                  [--rewrite] [--updateref] [--stale-fix]\n" \
+	   "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]")
 
 #define BUILTIN_REFLOG_DELETE_USAGE \
-	N_("git reflog delete [--rewrite] [--updateref] " \
-	   "[--dry-run | -n] [--verbose] <refs>...")
+	N_("git reflog delete [--rewrite] [--updateref]\n" \
+	   "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}...")
 
 #define BUILTIN_REFLOG_EXISTS_USAGE \
 	N_("git reflog exists <ref>")
-- 
2.35.1.1384.g7d2906948a1


  parent reply	other threads:[~2022-03-17 18:09 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-17 18:08 [PATCH 0/8] reflog: migrate fully to parse_options() Ævar Arnfjörð Bjarmason
2022-03-17 18:08 ` [PATCH 1/8] reflog.c: indent argument lists Ævar Arnfjörð Bjarmason
2022-03-17 19:42   ` John Cai
2022-03-17 18:08 ` [PATCH 2/8] reflog: refactor cmd_reflog() to "if" branches Ævar Arnfjörð Bjarmason
2022-03-17 18:08 ` [PATCH 3/8] reflog tests: add missing "git reflog exists" tests Ævar Arnfjörð Bjarmason
2022-03-17 18:08 ` [PATCH 4/8] reflog: move "usage" variables and use macros Ævar Arnfjörð Bjarmason
2022-03-17 18:08 ` Ævar Arnfjörð Bjarmason [this message]
2022-03-18  1:24   ` [PATCH 5/8] git reflog [expire|delete]: make -h output consistent with SYNOPSIS Junio C Hamano
2022-03-17 18:08 ` [PATCH 6/8] reflog exists: use parse_options() API Ævar Arnfjörð Bjarmason
2022-03-18  1:30   ` Junio C Hamano
2022-03-17 18:08 ` [PATCH 7/8] reflog: convert to " Ævar Arnfjörð Bjarmason
2022-03-18  1:49   ` Junio C Hamano
2022-03-17 18:08 ` [PATCH 8/8] reflog [show]: display sensible -h output Ævar Arnfjörð Bjarmason
2022-03-28 21:21   ` [PATCH] reflog: fix 'show' subcommand's argv SZEDER Gábor
2022-03-28 22:45     ` 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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=patch-5.8-130e718722b-20220317T180439Z-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johncai86@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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).