mirror of
https://github.com/git/git
synced 2024-11-04 16:17:49 +00:00
doc: format alternatives in synopsis
This is a list of various fixes on malformed alternative in commands and option syntax. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Acked-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
3c2a3fdc38
commit
0620ae0f5b
4 changed files with 9 additions and 7 deletions
|
@ -202,7 +202,7 @@ endif::git-pull[]
|
|||
destination of an explicit refspec; see `--prune`).
|
||||
|
||||
ifndef::git-pull[]
|
||||
--recurse-submodules[=yes|on-demand|no]::
|
||||
--recurse-submodules[=(yes|on-demand|no)]::
|
||||
This option controls if and under what conditions new commits of
|
||||
submodules should be fetched too. When recursing through submodules,
|
||||
`git fetch` always attempts to fetch "changed" submodules, that is, a
|
||||
|
|
|
@ -87,7 +87,7 @@ OPTIONS
|
|||
--verbose::
|
||||
Pass --verbose to git-fetch and git-merge.
|
||||
|
||||
--[no-]recurse-submodules[=yes|on-demand|no]::
|
||||
--[no-]recurse-submodules[=(yes|on-demand|no)]::
|
||||
This option controls if new commits of populated submodules should
|
||||
be fetched, and if the working trees of active submodules should be
|
||||
updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and
|
||||
|
@ -105,7 +105,7 @@ Options related to merging
|
|||
include::merge-options.txt[]
|
||||
|
||||
-r::
|
||||
--rebase[=false|true|merges|interactive]::
|
||||
--rebase[=(false|true|merges|interactive)]::
|
||||
When true, rebase the current branch on top of the upstream
|
||||
branch after fetching. If there is a remote-tracking branch
|
||||
corresponding to the upstream branch and the upstream branch
|
||||
|
|
|
@ -12,7 +12,7 @@ SYNOPSIS
|
|||
[--onto <newbase> | --keep-base] [<upstream> [<branch>]]
|
||||
'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
|
||||
--root [<branch>]
|
||||
'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)
|
||||
'git rebase' (--continue|--skip|--abort|--quit|--edit-todo|--show-current-patch)
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
@ -9,7 +9,7 @@ git-send-email - Send a collection of patches as emails
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git send-email' [<options>] <file|directory>...
|
||||
'git send-email' [<options>] (<file>|<directory>)...
|
||||
'git send-email' [<options>] <format-patch-options>
|
||||
'git send-email' --dump-aliases
|
||||
|
||||
|
@ -278,7 +278,7 @@ must be used for each option.
|
|||
if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`),
|
||||
then authentication is not attempted.
|
||||
|
||||
--smtp-debug=0|1::
|
||||
--smtp-debug=(0|1)::
|
||||
Enable (1) or disable (0) debug output. If enabled, SMTP
|
||||
commands and replies will be printed. Useful to debug TLS
|
||||
connection and authentication problems.
|
||||
|
@ -301,7 +301,9 @@ must be used for each option.
|
|||
Automating
|
||||
~~~~~~~~~~
|
||||
|
||||
--no-[to|cc|bcc]::
|
||||
--no-to::
|
||||
--no-cc::
|
||||
--no-bcc::
|
||||
Clears any list of "To:", "Cc:", "Bcc:" addresses previously
|
||||
set via config.
|
||||
|
||||
|
|
Loading…
Reference in a new issue