summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-04 12:39:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-04 12:39:49 (GMT)
commitc45505d081011c97953cba5383e8a7e5d7eb6c07 (patch)
tree8ad3afccfc0e8b44d651769dce67429dc27eaa87 /Documentation
parent643a9ea3e0d2937155bbce43e17bb132dc7166ff (diff)
parentf156a0934a53a4d564933ebce1b832a4e347d78a (diff)
downloadgit-c45505d081011c97953cba5383e8a7e5d7eb6c07.zip
git-c45505d081011c97953cba5383e8a7e5d7eb6c07.tar.gz
git-c45505d081011c97953cba5383e8a7e5d7eb6c07.tar.bz2
Merge branch 'rd/p4-doc-markup-env'
Doc markup update. * rd/p4-doc-markup-env: p4.txt: Use backquotes for variable names
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-p4.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 6646d5e..b9feceb 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -424,7 +424,7 @@ dedicating a client spec just for 'git p4'.
The name of the client can be given to 'git p4' in multiple ways. The
variable 'git-p4.client' takes precedence if it exists. Otherwise,
normal p4 mechanisms of determining the client are used: environment
-variable P4CLIENT, a file referenced by P4CONFIG, or the local host name.
+variable `P4CLIENT`, a file referenced by `P4CONFIG`, or the local host name.
BRANCH DETECTION
@@ -493,22 +493,22 @@ General variables
~~~~~~~~~~~~~~~~~
git-p4.user::
User specified as an option to all p4 commands, with '-u <user>'.
- The environment variable 'P4USER' can be used instead.
+ The environment variable `P4USER` can be used instead.
git-p4.password::
Password specified as an option to all p4 commands, with
'-P <password>'.
- The environment variable 'P4PASS' can be used instead.
+ The environment variable `P4PASS` can be used instead.
git-p4.port::
Port specified as an option to all p4 commands, with
'-p <port>'.
- The environment variable 'P4PORT' can be used instead.
+ The environment variable `P4PORT` can be used instead.
git-p4.host::
Host specified as an option to all p4 commands, with
'-h <host>'.
- The environment variable 'P4HOST' can be used instead.
+ The environment variable `P4HOST` can be used instead.
git-p4.client::
Client specified as an option to all p4 commands, with