From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Dec 2021 22:35:03 +0000 (-0800)
Subject: Merge branch 'ja/doc-cleanup'
X-Git-Tag: v2.35.0-rc0~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23c83fc47315d28dd2185618ecccaf403e2dd6a9;p=thirdparty%2Fgit.git

Merge branch 'ja/doc-cleanup'

Doc update.

* ja/doc-cleanup:
  init doc: --shared=0xxx does not give umask but perm bits
  doc: git-init: clarify file modes in octal.
  doc: git-http-push: describe the refs as pattern pairs
  doc: uniformize <URL> placeholders' case
  doc: use three dots for indicating repetition instead of star
  doc: git-ls-files: express options as optional alternatives
  doc: use only hyphens as word separators in placeholders
  doc: express grammar placeholders between angle brackets
  doc: split placeholders as individual tokens
  doc: fix git credential synopsis
---

23c83fc47315d28dd2185618ecccaf403e2dd6a9
diff --cc Documentation/git-help.txt
index 96d5f598b4,48eec3ec7c..44ea63cc6d
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@@ -8,10 -8,8 +8,10 @@@ git-help - Display help information abo
  SYNOPSIS
  --------
  [verse]
 -'git help' [-a|--all [--[no-]verbose]] [-g|--guides]
 -	   [-i|--info|-m|--man|-w|--web] [<command>|<guide>]
 +'git help' [-a|--all [--[no-]verbose]]
- 	   [[-i|--info] [-m|--man] [-w|--web]] [COMMAND|GUIDE]
++	   [[-i|--info] [-m|--man] [-w|--web]] [<command>|<guide>]
 +'git help' [-g|--guides]
 +'git help' [-c|--config]
  
  DESCRIPTION
  -----------