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 "_"
  ...

diff --cc Documentation/CodingGuidelines
Simple merge

diff --cc Documentation/git-clean.txt
Simple merge

diff --cc Documentation/git-commit-graph.txt
Simple merge

diff --cc Documentation/git-interpret-trailers.txt
Simple merge

diff --cc Documentation/git-show-branch.txt
Simple merge

diff --cc Documentation/git-stash.txt
Simple merge

diff --cc builtin/commit-graph.c
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/describe.c
Simple merge

diff --cc builtin/diagnose.c
Simple merge

diff --cc builtin/diff.c
Simple merge

diff --cc builtin/fsck.c
Simple merge

diff --cc builtin/help.c
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc builtin/show-branch.c
Simple merge

diff --cc builtin/show-ref.c
Simple merge

diff --cc builtin/stash.c
Simple merge

diff --cc builtin/symbolic-ref.c
index 590ed17dd3f52934ff5cd3bcdd4070ac3d015105,50b6df78df04e8ef70f74b2332ffb6db566e74bb..e00768a8b7ec48b04f670087730495b50353787e
--- 1/builtin/symbolic-ref.c
--- 2/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
  };
  

diff --cc help.c
Simple merge