From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Oct 2022 18:26:54 +0000 (-0700)
Subject: Merge branch 'ab/doc-synopsis-and-cmd-usage'
X-Git-Tag: v2.39.0-rc0~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b9b634ca5e931941938c93bd233d9c6848fd7b2;p=thirdparty%2Fgit.git

Merge branch 'ab/doc-synopsis-and-cmd-usage'

The short-help text shown by "git cmd -h" and the synopsis text
shown at the beginning of "git help cmd" have been made more
consistent.

* ab/doc-synopsis-and-cmd-usage: (34 commits)
  tests: assert consistent whitespace in -h output
  tests: start asserting that *.txt SYNOPSIS matches -h output
  doc txt & -h consistency: make "worktree" consistent
  worktree: define subcommand -h in terms of command -h
  reflog doc: list real subcommands up-front
  doc txt & -h consistency: make "commit" consistent
  doc txt & -h consistency: make "diff-tree" consistent
  doc txt & -h consistency: use "[<label>...]" for "zero or more"
  doc txt & -h consistency: make "annotate" consistent
  doc txt & -h consistency: make "stash" consistent
  doc txt & -h consistency: add missing options
  doc txt & -h consistency: use "git foo" form, not "git-foo"
  doc txt & -h consistency: make "bundle" consistent
  doc txt & -h consistency: make "read-tree" consistent
  doc txt & -h consistency: make "rerere" consistent
  doc txt & -h consistency: add missing options and labels
  doc txt & -h consistency: make output order consistent
  doc txt & -h consistency: add or fix optional "--" syntax
  doc txt & -h consistency: fix mismatching labels
  doc SYNOPSIS & -h: use "-" to separate words in labels, not "_"
  ...
---

7b9b634ca5e931941938c93bd233d9c6848fd7b2
diff --cc builtin/symbolic-ref.c
index 590ed17dd3,50b6df78df..e00768a8b7
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@@ -5,8 -5,9 +5,9 @@@
  #include "parse-options.h"
  
  static const char * const git_symbolic_ref_usage[] = {
- 	N_("git symbolic-ref [<options>] <name> [<ref>]"),
- 	N_("git symbolic-ref -d [-q] [--no-recurse] <name>"),
+ 	N_("git symbolic-ref [-m <reason>] <name> <ref>"),
 -	N_("git symbolic-ref [-q] [--short] <name>"),
++	N_("git symbolic-ref [-q] [--short] [--no-recurse] <name>"),
+ 	N_("git symbolic-ref --delete [-q] <name>"),
  	NULL
  };