diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 20:06:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 20:06:34 (GMT) |
| commit | 073d0b0914af3a9c958175fde5c8f2cc278498db (patch) | |
| tree | 0024f68fed38ec103d5ab6d3ca8a7313d66ac664 /Documentation/git-p4.txt | |
| parent | a199a7c9d07fa883fa219775c0e6069aeb84cdf3 (diff) | |
| parent | ae9f6311e9c15d7968c2d03eab6e929e9c9d5f42 (diff) | |
| download | git-073d0b0914af3a9c958175fde5c8f2cc278498db.zip git-073d0b0914af3a9c958175fde5c8f2cc278498db.tar.gz git-073d0b0914af3a9c958175fde5c8f2cc278498db.tar.bz2 | |
Merge branch 'tr/doc-tt' into maint
The documentation set has been updated so that literal commands,
configuration variables and environment variables are consistently
typeset in fixed-width font and bold in manpages.
* tr/doc-tt:
doc: change configuration variables format
doc: more consistency in environment variables format
doc: change environment variables format
doc: clearer rule about formatting literals
Diffstat (limited to 'Documentation/git-p4.txt')
| -rw-r--r-- | Documentation/git-p4.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 88ba42b..9d4f151 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -134,7 +134,7 @@ Submit ~~~~~~ Submitting changes from a Git repository back to the p4 repository requires a separate p4 client workspace. This should be specified -using the 'P4CLIENT' environment variable or the Git configuration +using the `P4CLIENT` environment variable or the Git configuration variable 'git-p4.client'. The p4 client must exist, but the client root will be created and populated if it does not already exist. @@ -166,7 +166,7 @@ General options All commands except clone accept these options. --git-dir <dir>:: - Set the 'GIT_DIR' environment variable. See linkgit:git[1]. + Set the `GIT_DIR` environment variable. See linkgit:git[1]. -v:: --verbose:: |