Browse Source

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
maint
Junio C Hamano 13 years ago
parent
commit
7baf32a829
  1. 2
      Documentation/config.txt
  2. 2
      Documentation/git-commit.txt
  3. 2
      Documentation/git-mergetool--lib.txt
  4. 2
      Documentation/git-revert.txt
  5. 10
      Documentation/git-sh-i18n--envsubst.txt
  6. 2
      Documentation/git-sh-i18n.txt
  7. 2
      Documentation/git-submodule.txt
  8. 2
      Documentation/git-web--browse.txt
  9. 2
      Documentation/rev-list-options.txt

2
Documentation/config.txt

@ -678,7 +678,7 @@ branch.<name>.rebase:: @@ -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

2
Documentation/git-commit.txt

@ -284,7 +284,7 @@ When recording your own work, the contents of modified files in @@ -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,

2
Documentation/git-mergetool--lib.txt

@ -8,7 +8,7 @@ git-mergetool--lib - Common git merge tool shell scriptlets @@ -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
-----------

2
Documentation/git-revert.txt

@ -24,7 +24,7 @@ throw away all uncommitted changes in your working directory, you @@ -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

10
Documentation/git-sh-i18n--envsubst.txt

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
git-sh-i18n--envsubst(1)
========================
git-sh-i18n{litdd}envsubst(1)
=============================

NAME
----
@ -10,8 +10,8 @@ SYNOPSIS @@ -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. @@ -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.

2
Documentation/git-sh-i18n.txt

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

2
Documentation/git-submodule.txt

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

2
Documentation/git-web--browse.txt

@ -69,7 +69,7 @@ browser.<tool>.path @@ -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

2
Documentation/rev-list-options.txt

@ -313,7 +313,7 @@ that you are filtering for a file `foo` in this commit graph: @@ -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

Loading…
Cancel
Save