Skip to content

Commit af52e6b

Browse files
committed
Merge branch 'jn/doc-dashdash'
* jn/doc-dashdash: Documentation/i18n: quote double-dash for AsciiDoc Documentation: quote double-dash for AsciiDoc
2 parents 13ac90a + 27269fc commit af52e6b

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

Documentation/config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ branch.<name>.rebase::
676676
browser.<tool>.cmd::
677677
Specify the command to invoke the specified browser. The
678678
specified command is evaluated in shell with the URLs passed
679-
as arguments. (See linkgit:git-web--browse[1].)
679+
as arguments. (See linkgit:git-web{litdd}browse[1].)
680680

681681
browser.<tool>.path::
682682
Override the path for the given tool that may be used to

Documentation/git-commit.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ When recording your own work, the contents of modified files in
284284
your working tree are temporarily stored to a staging area
285285
called the "index" with 'git add'. A file can be
286286
reverted back, only in the index but not in the working tree,
287-
to that of the last commit with `git reset HEAD -- <file>`,
287+
to that of the last commit with `git reset HEAD \-- <file>`,
288288
which effectively reverts 'git add' and prevents the changes to
289289
this file from participating in the next commit. After building
290290
the state to be committed incrementally with these commands,

Documentation/git-mergetool--lib.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ git-mergetool--lib - Common git merge tool shell scriptlets
77

88
SYNOPSIS
99
--------
10-
'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib"'
10+
'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
1111

1212
DESCRIPTION
1313
-----------

Documentation/git-revert.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ throw away all uncommitted changes in your working directory, you
2323
should see linkgit:git-reset[1], particularly the '--hard' option. If
2424
you want to extract specific files as they were in another commit, you
2525
should see linkgit:git-checkout[1], specifically the `git checkout
26-
<commit> -- <filename>` syntax. Take care with these alternatives as
26+
<commit> \-- <filename>` syntax. Take care with these alternatives as
2727
both will discard uncommitted changes in your working directory.
2828

2929
OPTIONS

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
git-sh-i18n--envsubst(1)
2-
========================
1+
git-sh-i18n{litdd}envsubst(1)
2+
=============================
33

44
NAME
55
----
@@ -10,8 +10,8 @@ SYNOPSIS
1010
[verse]
1111
eval_gettext () {
1212
printf "%s" "$1" | (
13-
export PATH $('git sh-i18n--envsubst' --variables "$1");
14-
'git sh-i18n--envsubst' "$1"
13+
export PATH $('git sh-i18n{litdd}envsubst' --variables "$1");
14+
'git sh-i18n{litdd}envsubst' "$1"
1515
)
1616
}
1717

@@ -22,7 +22,7 @@ This is not a command the end user would want to run. Ever.
2222
This documentation is meant for people who are studying the
2323
plumbing scripts and/or are writing new ones.
2424

25-
git-sh-i18n--envsubst is Git's stripped-down copy of the GNU
25+
'git sh-i18n{litdd}envsubst' is Git's stripped-down copy of the GNU
2626
`envsubst(1)` program that comes with the GNU gettext package. It's
2727
used internally by linkgit:git-sh-i18n[1] to interpolate the variables
2828
passed to the the `eval_gettext` function.

Documentation/git-sh-i18n.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ gettext::
3434
eval_gettext::
3535
Currently a dummy fall-through function implemented as a wrapper
3636
around `printf(1)` with variables expanded by the
37-
linkgit:git-sh-i18n--envsubst[1] helper. Will be replaced by a
37+
linkgit:git-sh-i18n{litdd}envsubst[1] helper. Will be replaced by a
3838
real gettext implementation in a later version.
3939

4040
GIT

Documentation/git-submodule.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ sync::
172172
repositories accordingly.
173173
+
174174
"git submodule sync" synchronizes all submodules while
175-
"git submodule sync -- A" synchronizes submodule "A" only.
175+
"git submodule sync \-- A" synchronizes submodule "A" only.
176176

177177
OPTIONS
178178
-------

Documentation/git-web--browse.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ browser.<tool>.path
6868
You can explicitly provide a full path to your preferred browser by
6969
setting the configuration variable 'browser.<tool>.path'. For example,
7070
you can configure the absolute path to firefox by setting
71-
'browser.firefox.path'. Otherwise, 'git web--browse' assumes the tool
71+
'browser.firefox.path'. Otherwise, 'git web{litdd}browse' assumes the tool
7272
is available in PATH.
7373

7474
browser.<tool>.cmd

Documentation/rev-list-options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ that you are filtering for a file `foo` in this commit graph:
313313
\ / / / /
314314
`-------------'
315315
-----------------------------------------------------------------------
316-
The horizontal line of history A--P is taken to be the first parent of
316+
The horizontal line of history A---P is taken to be the first parent of
317317
each merge. The commits are:
318318

319319
* `I` is the initial commit, in which `foo` exists with contents

0 commit comments

Comments
 (0)