Merge branch 'jn/doc-dashdash' into maint

* jn/doc-dashdash:
Documentation/i18n: quote double-dash for AsciiDoc
Documentation: quote double-dash for AsciiDoc

Conflicts:
Documentation/git-mergetool--lib.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4914d768c7c2f14abd854a58c594a4e88184047d..ae9913b03464b2ebde13002e1071a6c3471ee9cf 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -678,7 +678,7 @@ branch.<name>.rebase::
 browser.<tool>.cmd::
        Specify the command to invoke the specified browser. The
        specified command is evaluated in shell with the URLs passed
-       as arguments. (See linkgit:git-web--browse[1].)
+       as arguments. (See linkgit:git-web{litdd}browse[1].)
 
 browser.<tool>.path::
        Override the path for the given tool that may be used to

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 7951cb7b005bf472c449a563d073036ceb8b921a..5cc84a139133dca2fdcb594007c8b0d6464d5ca8 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -284,7 +284,7 @@ When recording your own work, the contents of modified files in
 your working tree are temporarily stored to a staging area
 called the "index" with 'git add'.  A file can be
 reverted back, only in the index but not in the working tree,
-to that of the last commit with `git reset HEAD -- <file>`,
+to that of the last commit with `git reset HEAD \-- <file>`,
 which effectively reverts 'git add' and prevents the changes to
 this file from participating in the next commit.  After building
 the state to be committed incrementally with these commands,

diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt
index 8c5be6775d3d2a03518f07f90a2c336d558fdde5..f98a41b87c16007d6d9fa916c6a3bb31fb049216 100644 (file)
--- a/Documentation/git-mergetool--lib.txt
+++ b/Documentation/git-mergetool--lib.txt
@@ -8,7 +8,7 @@ git-mergetool--lib - Common git merge tool shell scriptlets
 SYNOPSIS
 --------
 [verse]
-'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"'
+'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
 
 DESCRIPTION
 -----------

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index e4b46cfd3fb1faeca5c49cb2e67d5783af7def0f..3d0a7d1dac5614d6644a0ea226d65bd9f667143a 100644 (file)
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -24,7 +24,7 @@ throw away all uncommitted changes in your working directory, you
 should see linkgit:git-reset[1], particularly the '--hard' option.  If
 you want to extract specific files as they were in another commit, you
 should see linkgit:git-checkout[1], specifically the `git checkout
-<commit> -- <filename>` syntax.  Take care with these alternatives as
+<commit> \-- <filename>` syntax.  Take care with these alternatives as
 both will discard uncommitted changes in your working directory.
 
 OPTIONS

diff --git a/Documentation/git-sh-i18n--envsubst.txt b/Documentation/git-sh-i18n--envsubst.txt
index 61e4c08dacf796853284ee03c3ccdbebddb51a9b..5c3ec327bbc5836c53b0b94f9dc0de4772661e36 100644 (file)
--- a/Documentation/git-sh-i18n--envsubst.txt
+++ b/Documentation/git-sh-i18n--envsubst.txt
@@ -1,5 +1,5 @@
-git-sh-i18n--envsubst(1)
-========================
+git-sh-i18n{litdd}envsubst(1)
+=============================
 
 NAME
 ----
@@ -10,8 +10,8 @@ SYNOPSIS
 [verse]
 eval_gettext () {
        printf "%s" "$1" | (
-               export PATH $('git sh-i18n--envsubst' --variables "$1");
-               'git sh-i18n--envsubst' "$1"
+               export PATH $('git sh-i18n{litdd}envsubst' --variables "$1");
+               'git sh-i18n{litdd}envsubst' "$1"
        )
 }
 
@@ -22,7 +22,7 @@ This is not a command the end user would want to run.  Ever.
 This documentation is meant for people who are studying the
 plumbing scripts and/or are writing new ones.
 
-git-sh-i18n--envsubst is Git's stripped-down copy of the GNU
+'git sh-i18n{litdd}envsubst' is Git's stripped-down copy of the GNU
 `envsubst(1)` program that comes with the GNU gettext package. It's
 used internally by linkgit:git-sh-i18n[1] to interpolate the variables
 passed to the the `eval_gettext` function.

diff --git a/Documentation/git-sh-i18n.txt b/Documentation/git-sh-i18n.txt
index eafa55af7e4270a19b91f85aa4b82e6b3cde1bc3..60cf49cb2a38df99d4526698576acd5cb6c979c4 100644 (file)
--- a/Documentation/git-sh-i18n.txt
+++ b/Documentation/git-sh-i18n.txt
@@ -35,7 +35,7 @@ gettext::
 eval_gettext::
        Currently a dummy fall-through function implemented as a wrapper
        around `printf(1)` with variables expanded by the
-       linkgit:git-sh-i18n--envsubst[1] helper. Will be replaced by a
+       linkgit:git-sh-i18n{litdd}envsubst[1] helper. Will be replaced by a
        real gettext implementation in a later version.
 
 GIT

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 585f03681b7aca236679a3f3d507f02c6736fdf9..0ec85742ddc1c360d066659fb562898a259e48f7 100644 (file)
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -176,7 +176,7 @@ sync::
        repositories accordingly.
 +
 "git submodule sync" synchronizes all submodules while
-"git submodule sync -- A" synchronizes submodule "A" only.
+"git submodule sync \-- A" synchronizes submodule "A" only.
 
 OPTIONS
 -------

diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 8b4f65ae449a1ceac8079acbe35a608157aca575..c2bc87bc61da28a9eb451ef1cb5b4d811b02e4f7 100644 (file)
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt
@@ -69,7 +69,7 @@ browser.<tool>.path
 You can explicitly provide a full path to your preferred browser by
 setting the configuration variable 'browser.<tool>.path'. For example,
 you can configure the absolute path to firefox by setting
-'browser.firefox.path'. Otherwise, 'git web--browse' assumes the tool
+'browser.firefox.path'. Otherwise, 'git web{litdd}browse' assumes the tool
 is available in PATH.
 
 browser.<tool>.cmd

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 62340a5e4c3751000208cee289c0e4341f5c046c..39e62072691d408519ff377cb6e91e8d95175ec4 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -313,7 +313,7 @@ that you are filtering for a file `foo` in this commit graph:
         \   /   /   /   /
          `-------------'
 -----------------------------------------------------------------------
-The horizontal line of history A--P is taken to be the first parent of
+The horizontal line of history A---P is taken to be the first parent of
 each merge.  The commits are:
 
 * `I` is the initial commit, in which `foo` exists with contents