@matheusbsbs / matheus-bagliano / commits / e994004f93
Fork 0

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>

sean committed May 5, 2006 at 15:05 UTC e994004f93a481414b9065ac24edd0807d1c311e
12 files changed +13 -13
Documentation/git-add.txt
+1 -1
@@ -26,7 +26,7 @@ OPTIONS
26 -v::
27 Be verbose.
28
29 ---::
29 +\--::
30 This option can be used to separate command-line options from
31 the list of files, (useful when filenames might be mistaken
32 for command-line options).
Documentation/git-checkout-index.txt
+1 -1
@@ -63,7 +63,7 @@ OPTIONS
63 Only meaningful with `--stdin`; paths are separated with
64 NUL character instead of LF.
65
66 ---::
66 +\--::
67 Do not interpret any more arguments as options.
68
69 The order of the flags used to matter, but not anymore.
Documentation/git-commit.txt
+1 -1
@@ -106,7 +106,7 @@ but can be used to amend a merge commit.
106 index and the latest commit does not match on the
107 specified paths to avoid confusion.
108
109 ---::
109 +\--::
110 Do not interpret any more arguments as options.
111
112 <file>...::
Documentation/git-log.txt
+1 -1
@@ -51,7 +51,7 @@ git log v2.6.12.. include/scsi drivers/scsi::
51 Show all commits since version 'v2.6.12' that changed any file
52 in the include/scsi or drivers/scsi subdirectories
53
54 -git log --since="2 weeks ago" -- gitk::
54 +git log --since="2 weeks ago" \-- gitk::
55
56 Show the changes during the last two weeks to the file 'gitk'.
57 The "--" is necessary to avoid confusion with the *branch* named
Documentation/git-ls-files.txt
+1 -1
@@ -106,7 +106,7 @@ OPTIONS
106 lines, show only handful hexdigits prefix.
107 Non default number of digits can be specified with --abbrev=<n>.
108
109 ---::
109 +\--::
110 Do not interpret any more arguments as options.
111
112 <file>::
Documentation/git-merge-index.txt
+2 -2
@@ -8,7 +8,7 @@ git-merge-index - Runs a merge for files needing merging
8
9 SYNOPSIS
10 --------
11 -'git-merge-index' [-o] [-q] <merge-program> (-a | -- | <file>\*)
11 +'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*)
12
13 DESCRIPTION
14 -----------
@@ -19,7 +19,7 @@ files are passed as arguments 5, 6 and 7.
19
20 OPTIONS
21 -------
22 ---::
22 +\--::
23 Do not interpret any more arguments as options.
24
25 -a::
Documentation/git-prune.txt
+1 -1
@@ -28,7 +28,7 @@ OPTIONS
28 Do not remove anything; just report what it would
29 remove.
30
31 ---::
31 +\--::
32 Do not interpret any more arguments as options.
33
34 <head>...::
Documentation/git-rm.txt
+1 -1
@@ -32,7 +32,7 @@ OPTIONS
32 -v::
33 Be verbose.
34
35 ---::
35 +\--::
36 This option can be used to separate command-line options from
37 the list of files, (useful when filenames might be mistaken
38 for command-line options).
Documentation/git-update-index.txt
+1 -1
@@ -113,7 +113,7 @@ OPTIONS
113 Only meaningful with `--stdin`; paths are separated with
114 NUL character instead of LF.
115
116 ---::
116 +\--::
117 Do not interpret any more arguments as options.
118
119 <file>::
Documentation/git-verify-pack.txt
+1 -1
@@ -25,7 +25,7 @@ OPTIONS
25 -v::
26 After verifying the pack, show list of objects contained
27 in the pack.
28 ---::
28 +\--::
29 Do not interpret any more arguments as options.
30
31 OUTPUT FORMAT
Documentation/git-whatchanged.txt
+1 -1
@@ -58,7 +58,7 @@ git-whatchanged -p v2.6.12.. include/scsi drivers/scsi::
58 Show as patches the commits since version 'v2.6.12' that changed
59 any file in the include/scsi or drivers/scsi subdirectories
60
61 -git-whatchanged --since="2 weeks ago" -- gitk::
61 +git-whatchanged --since="2 weeks ago" \-- gitk::
62
63 Show the changes during the last two weeks to the file 'gitk'.
64 The "--" is necessary to avoid confusion with the *branch* named
Documentation/gitk.txt
+1 -1
@@ -31,7 +31,7 @@ gitk v2.6.12.. include/scsi drivers/scsi::
31 Show as the changes since version 'v2.6.12' that changed any
32 file in the include/scsi or drivers/scsi subdirectories
33
34 -gitk --since="2 weeks ago" -- gitk::
34 +gitk --since="2 weeks ago" \-- gitk::
35
36 Show the changes during the last two weeks to the file 'gitk'.
37 The "--" is necessary to avoid confusion with the *branch* named