]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git reflog [expire|delete]: make -h output consistent with SYNOPSIS
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Thu, 17 Mar 2022 18:08:37 +0000 (19:08 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Mar 2022 01:03:12 +0000 (18:03 -0700)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/reflog.c

index 25313d504a91b42056da952cfb371f70c1835f44..458764400b5b0f5870d1c7dccabd54feb9d6dfb8 100644 (file)
@@ -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>")