mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'ma/double-dashes-in-docs'
Doc formatting updates. * ma/double-dashes-in-docs: git-submodule.txt: quote usage in monospace, drop backslash git-[short]log.txt: unify quoted standalone -- doc: convert [\--] to [--] doc: convert \--option to --option
This commit is contained in:
commit
535cfa32d7
|
@ -47,7 +47,7 @@ There are two ways to specify which commits to operate on.
|
|||
|
||||
The first rule takes precedence in the case of a single <commit>. To
|
||||
apply the second rule, i.e., format everything since the beginning of
|
||||
history up until <commit>, use the '\--root' option: `git format-patch
|
||||
history up until <commit>, use the `--root` option: `git format-patch
|
||||
--root <commit>`. If you want to format only <commit> itself, you
|
||||
can do this with `git format-patch -1 <commit>`.
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ git-log - Show commit logs
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git log' [<options>] [<revision range>] [[\--] <path>...]
|
||||
'git log' [<options>] [<revision range>] [[--] <path>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
@ -90,13 +90,13 @@ include::line-range-format.txt[]
|
|||
ways to spell <revision range>, see the 'Specifying Ranges'
|
||||
section of linkgit:gitrevisions[7].
|
||||
|
||||
[\--] <path>...::
|
||||
[--] <path>...::
|
||||
Show only commits that are enough to explain how the files
|
||||
that match the specified paths came to be. See 'History
|
||||
Simplification' below for details and other simplification
|
||||
modes.
|
||||
+
|
||||
Paths may need to be prefixed with ``\-- '' to separate them from
|
||||
Paths may need to be prefixed with `--` to separate them from
|
||||
options or the revision range, when confusion arises.
|
||||
|
||||
include::rev-list-options.txt[]
|
||||
|
@ -125,7 +125,7 @@ EXAMPLES
|
|||
`git log --since="2 weeks ago" -- gitk`::
|
||||
|
||||
Show the changes during the last two weeks to the file 'gitk'.
|
||||
The ``--'' is necessary to avoid confusion with the *branch* named
|
||||
The `--` is necessary to avoid confusion with the *branch* named
|
||||
'gitk'
|
||||
|
||||
`git log --name-status release..test`::
|
||||
|
|
|
@ -300,7 +300,7 @@ origin +master` to force a push to the `master` branch). See the
|
|||
These options are passed to linkgit:git-send-pack[1]. A thin transfer
|
||||
significantly reduces the amount of sent data when the sender and
|
||||
receiver share many of the same objects in common. The default is
|
||||
\--thin.
|
||||
`--thin`.
|
||||
|
||||
-q::
|
||||
--quiet::
|
||||
|
|
|
@ -8,7 +8,7 @@ git-shortlog - Summarize 'git log' output
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git shortlog' [<options>] [<revision range>] [[\--] <path>...]
|
||||
'git shortlog' [<options>] [<revision range>] [[--] <path>...]
|
||||
git log --pretty=short | 'git shortlog' [<options>]
|
||||
|
||||
DESCRIPTION
|
||||
|
@ -69,11 +69,11 @@ them.
|
|||
ways to spell <revision range>, see the "Specifying Ranges"
|
||||
section of linkgit:gitrevisions[7].
|
||||
|
||||
[\--] <path>...::
|
||||
[--] <path>...::
|
||||
Consider only commits that are enough to explain how the files
|
||||
that match the specified paths came to be.
|
||||
+
|
||||
Paths may need to be prefixed with "\-- " to separate them from
|
||||
Paths may need to be prefixed with `--` to separate them from
|
||||
options or the revision range, when confusion arises.
|
||||
|
||||
MAPPING AUTHORS
|
||||
|
|
|
@ -213,8 +213,8 @@ sync [--recursive] [--] [<path>...]::
|
|||
submodule URLs change upstream and you need to update your local
|
||||
repositories accordingly.
|
||||
+
|
||||
"git submodule sync" synchronizes all submodules while
|
||||
"git submodule sync \-- A" synchronizes submodule "A" only.
|
||||
`git submodule sync` synchronizes all submodules while
|
||||
`git submodule sync -- A` synchronizes submodule "A" only.
|
||||
+
|
||||
If `--recursive` is specified, this command will recurse into the
|
||||
registered submodules, and sync any nested submodules within.
|
||||
|
|
|
@ -8,7 +8,7 @@ gitk - The Git repository browser
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'gitk' [<options>] [<revision range>] [\--] [<path>...]
|
||||
'gitk' [<options>] [<revision range>] [--] [<path>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
Loading…
Reference in a new issue