Skip to content

Commit e994004

Browse files
loopsJunio C Hamano
authored andcommitted
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>
1 parent 2b5f3ed commit e994004

File tree

12 files changed

+13
-13
lines changed

12 files changed

+13
-13
lines changed

Documentation/git-add.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ OPTIONS
2626
-v::
2727
Be verbose.
2828

29-
--::
29+
\--::
3030
This option can be used to separate command-line options from
3131
the list of files, (useful when filenames might be mistaken
3232
for command-line options).

Documentation/git-checkout-index.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ OPTIONS
6363
Only meaningful with `--stdin`; paths are separated with
6464
NUL character instead of LF.
6565

66-
--::
66+
\--::
6767
Do not interpret any more arguments as options.
6868

6969
The order of the flags used to matter, but not anymore.

Documentation/git-commit.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ but can be used to amend a merge commit.
106106
index and the latest commit does not match on the
107107
specified paths to avoid confusion.
108108

109-
--::
109+
\--::
110110
Do not interpret any more arguments as options.
111111

112112
<file>...::

Documentation/git-log.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ git log v2.6.12.. include/scsi drivers/scsi::
5151
Show all commits since version 'v2.6.12' that changed any file
5252
in the include/scsi or drivers/scsi subdirectories
5353

54-
git log --since="2 weeks ago" -- gitk::
54+
git log --since="2 weeks ago" \-- gitk::
5555

5656
Show the changes during the last two weeks to the file 'gitk'.
5757
The "--" is necessary to avoid confusion with the *branch* named

Documentation/git-ls-files.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ OPTIONS
106106
lines, show only handful hexdigits prefix.
107107
Non default number of digits can be specified with --abbrev=<n>.
108108

109-
--::
109+
\--::
110110
Do not interpret any more arguments as options.
111111

112112
<file>::

Documentation/git-merge-index.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ git-merge-index - Runs a merge for files needing merging
88

99
SYNOPSIS
1010
--------
11-
'git-merge-index' [-o] [-q] <merge-program> (-a | -- | <file>\*)
11+
'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*)
1212

1313
DESCRIPTION
1414
-----------
@@ -19,7 +19,7 @@ files are passed as arguments 5, 6 and 7.
1919

2020
OPTIONS
2121
-------
22-
--::
22+
\--::
2323
Do not interpret any more arguments as options.
2424

2525
-a::

Documentation/git-prune.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ OPTIONS
2828
Do not remove anything; just report what it would
2929
remove.
3030

31-
--::
31+
\--::
3232
Do not interpret any more arguments as options.
3333

3434
<head>...::

Documentation/git-rm.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ OPTIONS
3232
-v::
3333
Be verbose.
3434

35-
--::
35+
\--::
3636
This option can be used to separate command-line options from
3737
the list of files, (useful when filenames might be mistaken
3838
for command-line options).

Documentation/git-update-index.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ OPTIONS
113113
Only meaningful with `--stdin`; paths are separated with
114114
NUL character instead of LF.
115115

116-
--::
116+
\--::
117117
Do not interpret any more arguments as options.
118118

119119
<file>::

Documentation/git-verify-pack.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ OPTIONS
2525
-v::
2626
After verifying the pack, show list of objects contained
2727
in the pack.
28-
--::
28+
\--::
2929
Do not interpret any more arguments as options.
3030

3131
OUTPUT FORMAT

0 commit comments

Comments
 (0)