Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Documentation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ ASCIIDOC_HTML = xhtml5
ASCIIDOC_DOCBOOK = docbook5
ASCIIDOC_EXTRA += -acompat-mode -atabsize=8
ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
ASCIIDOC_EXTRA += -adocinfo=shared
ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
DBLATEX_COMMON =
Expand Down
2 changes: 1 addition & 1 deletion Documentation/SubmittingPatches
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The people who may need to know are the ones who worked on the code
you are touching. These people happen to be the ones who are
most likely to be knowledgeable enough to help you, but
they have no obligation to help you (i.e. you ask them for help,
you don't demand). +git log -p {litdd} _$area_you_are_modifying_+ would
you don't demand). +git log -p \-- _$area_you_are_modifying_+ would
help you find out who they are.

. You get comments and suggestions for improvements. You may even get
Expand Down
1 change: 0 additions & 1 deletion Documentation/asciidoc.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ backslash=\
tilde=~
apostrophe='
backtick=`
litdd=--
manmanual=Git Manual
mansource=Git @GIT_VERSION@
revdate=@GIT_DATE@
Expand Down
2 changes: 1 addition & 1 deletion Documentation/config/browser.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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{litdd}browse[1].)
as arguments. (See linkgit:git-web\--browse[1].)

browser.<tool>.path::
Override the path for the given tool that may be used to
Expand Down
2 changes: 1 addition & 1 deletion Documentation/config/core.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ core.protectNTFS::

core.fsmonitor::
If set to true, enable the built-in file system monitor
daemon for this working directory (linkgit:git-fsmonitor{litdd}daemon[1]).
daemon for this working directory (linkgit:git-fsmonitor\--daemon[1]).
+
Like hook-based file system monitors, the built-in file system monitor
can speed up Git commands that need to refresh the Git index
Expand Down
6 changes: 3 additions & 3 deletions Documentation/git-archimport.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ archives that it imports, it is also possible to specify Git branch names
manually. To do so, write a Git branch name after each <archive>/<branch>
parameter, separated by a colon. This way, you can shorten the Arch
branch names and convert Arch jargon to Git jargon, for example mapping a
"PROJECT{litdd}devo{litdd}VERSION" branch to "master".
"PROJECT\--devo\--VERSION" branch to "master".

Associating multiple Arch branches to one Git branch is possible; the
result will make the most sense only if no commits are made to the first
Expand Down Expand Up @@ -86,8 +86,8 @@ OPTIONS
-o::
Use this for compatibility with old-style branch names used by
earlier versions of 'git archimport'. Old-style branch names
were category{litdd}branch, whereas new-style branch names are
archive,category{litdd}branch{litdd}version. In both cases, names given
were category\--branch, whereas new-style branch names are
archive,category\--branch\--version. In both cases, names given
on the command-line will override the automatically-generated
ones.

Expand Down
6 changes: 3 additions & 3 deletions Documentation/git-credential-cache--daemon.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
git-credential-cache{litdd}daemon(1)
====================================
git-credential-cache\--daemon(1)
================================

NAME
----
Expand All @@ -8,7 +8,7 @@ git-credential-cache--daemon - Temporarily store user credentials in memory
SYNOPSIS
--------
[verse]
'git credential-cache{litdd}daemon' [--debug] <socket-path>
'git credential-cache\--daemon' [--debug] <socket-path>

DESCRIPTION
-----------
Expand Down
12 changes: 6 additions & 6 deletions Documentation/git-fsmonitor--daemon.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
git-fsmonitor{litdd}daemon(1)
=============================
git-fsmonitor\--daemon(1)
=========================

NAME
----
Expand All @@ -8,10 +8,10 @@ git-fsmonitor--daemon - A Built-in Filesystem Monitor
SYNOPSIS
--------
[verse]
'git fsmonitor{litdd}daemon' start
'git fsmonitor{litdd}daemon' run
'git fsmonitor{litdd}daemon' stop
'git fsmonitor{litdd}daemon' status
'git fsmonitor\--daemon' start
'git fsmonitor\--daemon' run
'git fsmonitor\--daemon' stop
'git fsmonitor\--daemon' status

DESCRIPTION
-----------
Expand Down
6 changes: 3 additions & 3 deletions Documentation/git-help.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ other display programs (see below).
+
The web browser can be specified using the configuration variable
`help.browser`, or `web.browser` if the former is not set. If neither of
these config variables is set, the 'git web{litdd}browse' helper script
these config variables is set, the 'git web\--browse' helper script
(called by 'git help') will pick a suitable default. See
linkgit:git-web{litdd}browse[1] for more information about this.
linkgit:git-web\--browse[1] for more information about this.

CONFIGURATION VARIABLES
-----------------------
Expand All @@ -135,7 +135,7 @@ help.browser, web.browser, and browser.<tool>.path
The `help.browser`, `web.browser` and `browser.<tool>.path` will also
be checked if the 'web' format is chosen (either by command-line
option or configuration variable). See '-w|--web' in the OPTIONS
section above and linkgit:git-web{litdd}browse[1].
section above and linkgit:git-web\--browse[1].

man.viewer
~~~~~~~~~~
Expand Down
6 changes: 3 additions & 3 deletions Documentation/git-instaweb.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ OPTIONS
-b::
--browser::
The web browser that should be used to view the gitweb
page. This will be passed to the 'git web{litdd}browse' helper
page. This will be passed to the 'git web\--browse' helper
script along with the URL of the gitweb instance. See
linkgit:git-web{litdd}browse[1] for more information about this. If
linkgit:git-web\--browse[1] for more information about this. If
the script fails, the URL will be printed to stdout.

start::
Expand Down Expand Up @@ -83,7 +83,7 @@ You may specify configuration in your .git/config

If the configuration variable `instaweb.browser` is not set,
`web.browser` will be used instead if it is defined. See
linkgit:git-web{litdd}browse[1] for more information about this.
linkgit:git-web\--browse[1] for more information about this.

SEE ALSO
--------
Expand Down
10 changes: 5 additions & 5 deletions Documentation/git-mergetool--lib.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
git-mergetool{litdd}lib(1)
==========================
git-mergetool\--lib(1)
======================

NAME
----
Expand All @@ -8,7 +8,7 @@ git-mergetool--lib - Common Git merge tool shell scriptlets
SYNOPSIS
--------
[verse]
'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool{litdd}lib"'
'TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool\--lib"'

DESCRIPTION
-----------
Expand All @@ -17,11 +17,11 @@ This is not a command the end user would want to run. Ever.
This documentation is meant for people who are studying the
Porcelain-ish scripts and/or are writing new ones.

The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using
The 'git-mergetool\--lib' scriptlet is designed to be sourced (using
`.`) by other shell scripts to set up functions for working
with Git merge tools.

Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE`
Before sourcing 'git-mergetool\--lib', your script must set `TOOL_MODE`
to define the operation mode for the functions listed below.
'diff' and 'merge' are valid values.

Expand Down
10 changes: 5 additions & 5 deletions Documentation/git-sh-i18n--envsubst.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
git-sh-i18n{litdd}envsubst(1)
=============================
git-sh-i18n\--envsubst(1)
=========================

NAME
----
Expand All @@ -10,8 +10,8 @@ SYNOPSIS
[verse]
eval_gettext () {
printf "%s" "$1" | (
export PATH $('git sh-i18n{litdd}envsubst' --variables "$1");
'git sh-i18n{litdd}envsubst' "$1"
export PATH $('git sh-i18n\--envsubst' --variables "$1");
'git sh-i18n\--envsubst' "$1"
)
}

Expand All @@ -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{litdd}envsubst' is Git's stripped-down copy of the GNU
'git sh-i18n\--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 `eval_gettext` function.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-sh-i18n.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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{litdd}envsubst[1] helper. Will be replaced by a
linkgit:git-sh-i18n\--envsubst[1] helper. Will be replaced by a
real gettext implementation in a later version.

GIT
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-update-index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ This feature is intended to speed up git operations for repos that have
large working directories.

It enables git to work together with a file system monitor (see
linkgit:git-fsmonitor{litdd}daemon[1]
linkgit:git-fsmonitor\--daemon[1]
and the
"fsmonitor-watchman" section of linkgit:githooks[5]) that can
inform it as to what files have been modified. This enables git to avoid
Expand Down
10 changes: 5 additions & 5 deletions Documentation/git-web--browse.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
git-web{litdd}browse(1)
=======================
git-web\--browse(1)
===================

NAME
----
Expand All @@ -8,7 +8,7 @@ git-web--browse - Git helper script to launch a web browser
SYNOPSIS
--------
[verse]
'git web{litdd}browse' [<options>] (<URL>|<file>)...
'git web\--browse' [<options>] (<URL>|<file>)...

DESCRIPTION
-----------
Expand Down Expand Up @@ -71,7 +71,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{litdd}browse' assumes the tool
'browser.firefox.path'. Otherwise, 'git web\--browse' assumes the tool
is available in PATH.

browser.<tool>.cmd
Expand All @@ -80,7 +80,7 @@ browser.<tool>.cmd
When the browser, specified by options or configuration variables, is
not among the supported ones, then the corresponding
`browser.<tool>.cmd` configuration variable will be looked up. If this
variable exists then 'git web{litdd}browse' will treat the specified tool
variable exists then 'git web\--browse' will treat the specified tool
as a custom command and will use a shell eval to run the command with
the URLs passed as arguments.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/lint-gitlink.perl
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ sub report {
my ($target, $page, $section) = ($1, $2, $3);

# De-AsciiDoc
$page =~ s/{litdd}/--/g;
$page =~ s/\\--/--/g;

if (!exists $TXT{$page}) {
report($pos, $line, $target, "link outside of our own docs");
Expand Down
1 change: 0 additions & 1 deletion Documentation/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ elif docs_backend == 'asciidoctor'
asciidoctor,
'--attribute', 'compat-mode',
'--attribute', 'tabsize=8',
'--attribute', 'litdd=&#x2d;&#x2d;',
'--attribute', 'docinfo=shared',
'--attribute', 'build_dir=' + meson.current_build_dir(),
'--load-path', meson.current_build_dir(),
Expand Down
1 change: 0 additions & 1 deletion contrib/subtree/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ ASCIIDOC_CONF =
ASCIIDOC_HTML = xhtml5
ASCIIDOC_DOCBOOK = docbook
ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
ASCIIDOC_DEPS = asciidoctor-extensions.rb
XMLTO_EXTRA += --skip-validation
endif
Expand Down
2 changes: 1 addition & 1 deletion t/t0450-txt-doc-vs-help.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ adoc_to_synopsis () {
-E '/^\[(verse|synopsis)\]$/,/^$/ {
/^$/q;
/^\[(verse|synopsis)\]$/d;
s/\{litdd\}/--/g;
s/\\--/--/g;
s/'\''(git[ a-z-]*)'\''/\1/g;

p;
Expand Down
Loading