mirror of
https://github.com/git/git
synced 2024-10-05 16:19:28 +00:00
Fix up docs where "--" isn't displayed correctly.
A bare "--" doesn't show up in man or html pages correctly as two individual dashes unless backslashed as \-- in the asciidoc source. Note, no backslash is needed inside a literal block. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
sean
Junio C Hamano
parent
2b5f3ed316
commit
e994004f93
|
|
@ -26,7 +26,7 @@ OPTIONS
|
|||
-v::
|
||||
Be verbose.
|
||||
|
||||
--::
|
||||
\--::
|
||||
This option can be used to separate command-line options from
|
||||
the list of files, (useful when filenames might be mistaken
|
||||
for command-line options).
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ OPTIONS
|
|||
Only meaningful with `--stdin`; paths are separated with
|
||||
NUL character instead of LF.
|
||||
|
||||
--::
|
||||
\--::
|
||||
Do not interpret any more arguments as options.
|
||||
|
||||
The order of the flags used to matter, but not anymore.
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ but can be used to amend a merge commit.
|
|||
index and the latest commit does not match on the
|
||||
specified paths to avoid confusion.
|
||||
|
||||
--::
|
||||
\--::
|
||||
Do not interpret any more arguments as options.
|
||||
|
||||
<file>...::
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ git log v2.6.12.. include/scsi drivers/scsi::
|
|||
Show all commits since version 'v2.6.12' that changed any file
|
||||
in the include/scsi or drivers/scsi subdirectories
|
||||
|
||||
git log --since="2 weeks ago" -- gitk::
|
||||
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
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ OPTIONS
|
|||
lines, show only handful hexdigits prefix.
|
||||
Non default number of digits can be specified with --abbrev=<n>.
|
||||
|
||||
--::
|
||||
\--::
|
||||
Do not interpret any more arguments as options.
|
||||
|
||||
<file>::
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-merge-index - Runs a merge for files needing merging
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-merge-index' [-o] [-q] <merge-program> (-a | -- | <file>\*)
|
||||
'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*)
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -19,7 +19,7 @@ files are passed as arguments 5, 6 and 7.
|
|||
|
||||
OPTIONS
|
||||
-------
|
||||
--::
|
||||
\--::
|
||||
Do not interpret any more arguments as options.
|
||||
|
||||
-a::
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ OPTIONS
|
|||
Do not remove anything; just report what it would
|
||||
remove.
|
||||
|
||||
--::
|
||||
\--::
|
||||
Do not interpret any more arguments as options.
|
||||
|
||||
<head>...::
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ OPTIONS
|
|||
-v::
|
||||
Be verbose.
|
||||
|
||||
--::
|
||||
\--::
|
||||
This option can be used to separate command-line options from
|
||||
the list of files, (useful when filenames might be mistaken
|
||||
for command-line options).
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ OPTIONS
|
|||
Only meaningful with `--stdin`; paths are separated with
|
||||
NUL character instead of LF.
|
||||
|
||||
--::
|
||||
\--::
|
||||
Do not interpret any more arguments as options.
|
||||
|
||||
<file>::
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ OPTIONS
|
|||
-v::
|
||||
After verifying the pack, show list of objects contained
|
||||
in the pack.
|
||||
--::
|
||||
\--::
|
||||
Do not interpret any more arguments as options.
|
||||
|
||||
OUTPUT FORMAT
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ git-whatchanged -p v2.6.12.. include/scsi drivers/scsi::
|
|||
Show as patches the commits since version 'v2.6.12' that changed
|
||||
any file in the include/scsi or drivers/scsi subdirectories
|
||||
|
||||
git-whatchanged --since="2 weeks ago" -- gitk::
|
||||
git-whatchanged --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
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ gitk v2.6.12.. include/scsi drivers/scsi::
|
|||
Show as the changes since version 'v2.6.12' that changed any
|
||||
file in the include/scsi or drivers/scsi subdirectories
|
||||
|
||||
gitk --since="2 weeks ago" -- gitk::
|
||||
gitk --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
|
||||
|
|
|
|||
Loading…
Reference in a new issue