aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-13 11:24:14 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-13 11:24:14 -0700
commitce18123cec7674b58bb57272fdfa28de6ecc6b18 (patch)
treefce7f39f74bb41dd3dc6d730752c24fc4ddda2c9 /Documentation/git.txt
parentfc8a3a607227297a5ec7b0ac60173a82b84b248f (diff)
parent661c3e9bc064564a492281364413dc805eaddf95 (diff)
downloadgit-ce18123cec7674b58bb57272fdfa28de6ecc6b18.tar.gz
Merge branch 'mm/doc-tt'
More mark-up updates to typeset strings that are expected to literally typed by the end user in fixed-width font. * mm/doc-tt: doc: typeset HEAD and variants as literal CodingGuidelines: formatting HEAD in documentation doc: typeset long options with argument as literal doc: typeset '--' as literal doc: typeset long command-line options as literal doc: typeset short command-line options as literal Documentation/git-mv.txt: fix whitespace indentation
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index bb32435874..c461701f57 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -514,7 +514,7 @@ OPTIONS
--help::
Prints the synopsis and a list of the most commonly used
- commands. If the option '--all' or '-a' is given then all
+ commands. If the option `--all` or `-a` is given then all
available commands are printed. If a Git command is named this
option will bring up the manual page for that command.
+
@@ -856,16 +856,16 @@ Git so take care if using a foreign front-end.
If the `GIT_DIR` environment variable is set then it
specifies a path to use instead of the default `.git`
for the base of the repository.
- The '--git-dir' command-line option also sets this value.
+ The `--git-dir` command-line option also sets this value.
`GIT_WORK_TREE`::
Set the path to the root of the working tree.
- This can also be controlled by the '--work-tree' command-line
+ This can also be controlled by the `--work-tree` command-line
option and the core.worktree configuration variable.
`GIT_NAMESPACE`::
Set the Git namespace; see linkgit:gitnamespaces[7] for details.
- The '--namespace' command-line option also sets this value.
+ The `--namespace` command-line option also sets this value.
`GIT_CEILING_DIRECTORIES`::
This should be a colon-separated list of absolute paths. If
@@ -980,7 +980,7 @@ other
The command will be given exactly two or four arguments: the
'username@host' (or just 'host') from the URL and the shell
command to execute on that remote system, optionally preceded by
- '-p' (literally) and the 'port' from the URL when it specifies
+ `-p` (literally) and the 'port' from the URL when it specifies
something other than the default SSH port.
+
`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted