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>

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index ae24547c8a03f5a2b9b850062c6237b35cff70c7..5e3112943d1947dbd8b58c23dd535eb4d527b80f 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -26,7 +26,7 @@ OPTIONS
 -v::
         Be verbose.
 
 -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).
        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).

diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt
index 09bd6a5535835b50da0848892d1fb497710d9781..765c173e1507056953e61159f32b9af6b64a3b15 100644 (file)
--- a/Documentation/git-checkout-index.txt
+++ b/Documentation/git-checkout-index.txt
@@ -63,7 +63,7 @@ OPTIONS
        Only meaningful with `--stdin`; paths are separated with
        NUL character instead of LF.
 
        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.
        Do not interpret any more arguments as options.
 
 The order of the flags used to matter, but not anymore.

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 0a7365b9a80ed0d134bccb3fbe4baacc59056423..38df59ce2357fcd37810b2aaca9d759e9138e654 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -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.
 
        index and the latest commit does not match on the
        specified paths to avoid confusion.
 

---::
+\--::

        Do not interpret any more arguments as options.
 
 <file>...::
        Do not interpret any more arguments as options.
 
 <file>...::

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index af378ffcf9b09bd3ae01566e405aadec75c28e61..c9ffff734c256d7db1470381f0eb74a8d7f81873 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -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
 
        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
 
        Show the changes during the last two weeks to the file 'gitk'.
        The "--" is necessary to avoid confusion with the *branch* named

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 796d049be69469b0ce0be61e9f5c88c19911d655..a29c633c8dfd15ee4bd3c8f4ae7aeceef91ea7fe 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -106,7 +106,7 @@ OPTIONS
        lines, show only handful hexdigits prefix.
        Non default number of digits can be specified with --abbrev=<n>.
 
        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>::
        Do not interpret any more arguments as options.
 
 <file>::

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index fbc986aa84d180d304a35a94dcd1f80e6a848b80..332e023d0f14be813ead6cb6915938910ea3a719 100644 (file)
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -8,7 +8,7 @@ git-merge-index - Runs a merge for files needing merging
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

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

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -19,7 +19,7 @@ files are passed as arguments 5, 6 and 7.
 
 OPTIONS
 -------
 
 OPTIONS
 -------

---::
+\--::

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

diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index f694fcbde809b17dc9fd974eba458dd7805dc426..a11e3030943ab3ffd10afa017640826795809d05 100644 (file)
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -28,7 +28,7 @@ OPTIONS
        Do not remove anything; just report what it would
        remove.
 
        Do not remove anything; just report what it would
        remove.
 

---::
+\--::

        Do not interpret any more arguments as options.
 
 <head>...::
        Do not interpret any more arguments as options.
 
 <head>...::

diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index c9c3088424ebd45e2220efde104e47b6e4cd8316..66fc478f5736957d56de10ddc69c5c0fd9aad9c6 100644 (file)
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -32,7 +32,7 @@ OPTIONS
 -v::
         Be verbose.
 
 -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).
        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).

diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 23f2b6f1a5bd40f9e60efaf70b9c59e230979a15..57177c7fb6fea75a39c3243495b0724a207add17 100644 (file)
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -113,7 +113,7 @@ OPTIONS
        Only meaningful with `--stdin`; paths are separated with
        NUL character instead of LF.
 
        Only meaningful with `--stdin`; paths are separated with
        NUL character instead of LF.
 

---::
+\--::

        Do not interpret any more arguments as options.
 
 <file>::
        Do not interpret any more arguments as options.
 
 <file>::

diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt
index 4962d6975f03df28f0ab9b733dd6c17c1c38f1cb..7a6132b016903801fd1070e062381a41ec52536a 100644 (file)
--- a/Documentation/git-verify-pack.txt
+++ b/Documentation/git-verify-pack.txt
@@ -25,7 +25,7 @@ OPTIONS
 -v::
        After verifying the pack, show list of objects contained
        in the pack.
 -v::
        After verifying the pack, show list of objects contained
        in the pack.

---::
+\--::

        Do not interpret any more arguments as options.
 
 OUTPUT FORMAT
        Do not interpret any more arguments as options.
 
 OUTPUT FORMAT

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index 641cb7ea97feee2971f59cd6113dc85bd41b4480..e8f21d02f774a914e7e8840150f6db86a2884178 100644 (file)
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -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
 
        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
 
        Show the changes during the last two weeks to the file 'gitk'.
        The "--" is necessary to avoid confusion with the *branch* named

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index eb126d7a4b02c979709dff716eb9c9a64c169952..cb482bf98ef9e2509ab2d2e1665933687538a574 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -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
 
        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
 
        Show the changes during the last two weeks to the file 'gitk'.
        The "--" is necessary to avoid confusion with the *branch* named