kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

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>
maint
sean 19 years ago committed by Junio C Hamano
parent
2b5f3ed316
commit
e994004f93
12 changed files with 13 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Documentation/git-add.txt
  2. 2
      Documentation/git-checkout-index.txt
  3. 2
      Documentation/git-commit.txt
  4. 2
      Documentation/git-log.txt
  5. 2
      Documentation/git-ls-files.txt
  6. 4
      Documentation/git-merge-index.txt
  7. 2
      Documentation/git-prune.txt
  8. 2
      Documentation/git-rm.txt
  9. 2
      Documentation/git-update-index.txt
  10. 2
      Documentation/git-verify-pack.txt
  11. 2
      Documentation/git-whatchanged.txt
  12. 2
      Documentation/gitk.txt

2
Documentation/git-add.txt
Unescape View File

@ -26,7 +26,7 @@ OPTIONS @@ -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).

2
Documentation/git-checkout-index.txt
Unescape View File

@ -63,7 +63,7 @@ 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.

2
Documentation/git-commit.txt
Unescape View File

@ -106,7 +106,7 @@ but can be used to amend a merge commit. @@ -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>...::

2
Documentation/git-log.txt
Unescape View File

@ -51,7 +51,7 @@ git log v2.6.12.. include/scsi drivers/scsi:: @@ -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

2
Documentation/git-ls-files.txt
Unescape View File

@ -106,7 +106,7 @@ OPTIONS @@ -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>::

4
Documentation/git-merge-index.txt
Unescape View File

@ -8,7 +8,7 @@ git-merge-index - Runs a merge for files needing merging @@ -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. @@ -19,7 +19,7 @@ files are passed as arguments 5, 6 and 7.

OPTIONS
-------
--::
\--::
Do not interpret any more arguments as options.

-a::

2
Documentation/git-prune.txt
Unescape View File

@ -28,7 +28,7 @@ OPTIONS @@ -28,7 +28,7 @@ OPTIONS
Do not remove anything; just report what it would
remove.

--::
\--::
Do not interpret any more arguments as options.

<head>...::

2
Documentation/git-rm.txt
Unescape View File

@ -32,7 +32,7 @@ OPTIONS @@ -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).

2
Documentation/git-update-index.txt
Unescape View File

@ -113,7 +113,7 @@ 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>::

2
Documentation/git-verify-pack.txt
Unescape View File

@ -25,7 +25,7 @@ OPTIONS @@ -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

2
Documentation/git-whatchanged.txt
Unescape View File

@ -58,7 +58,7 @@ git-whatchanged -p v2.6.12.. include/scsi drivers/scsi:: @@ -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

2
Documentation/gitk.txt
Unescape View File

@ -31,7 +31,7 @@ gitk v2.6.12.. include/scsi drivers/scsi:: @@ -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

Write Preview
Loading…
Cancel
Save