Skip to content

Commit 47d81b5

Browse files
Tom Russellogitster
authored andcommitted
doc: more consistency in environment variables format
Wrap with backticks (monospaced font) unwrapped or single-quotes wrapped (italic type) environment variables which are followed by the word "environment". It was obtained with: perl -pi -e "s/\'?(\\\$?[0-9A-Z\_]+)\'?(?= environment ?)/\`\1\`/g" *.txt One of the main purposes is to stick to the CodingGuidelines as possible so that people writting new documentation by mimicking the existing are more likely to have it right (even if they didn't read the CodingGuidelines). Signed-off-by: Tom Russello <[email protected]> Signed-off-by: Erwan Mathoniere <[email protected]> Signed-off-by: Samuel Groot <[email protected]> Signed-off-by: Matthieu Moy <[email protected]> Reviewed-by: Matthieu Moy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent eee7f4a commit 47d81b5

17 files changed

+27
-27
lines changed

Documentation/config.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -478,9 +478,9 @@ false), while all other repositories are assumed to be bare (bare
478478

479479
core.worktree::
480480
Set the path to the root of the working tree.
481-
If GIT_COMMON_DIR environment variable is set, core.worktree
481+
If `GIT_COMMON_DIR` environment variable is set, core.worktree
482482
is ignored and not used for determining the root of working tree.
483-
This can be overridden by the GIT_WORK_TREE environment
483+
This can be overridden by the `GIT_WORK_TREE` environment
484484
variable and the '--work-tree' command-line option.
485485
The value can be an absolute path or relative to the path to
486486
the .git directory, which is either specified by --git-dir
@@ -621,7 +621,7 @@ core.askPass::
621621
ask for a password can be told to use an external program given
622622
via the value of this variable. Can be overridden by the `GIT_ASKPASS`
623623
environment variable. If not set, fall back to the value of the
624-
'SSH_ASKPASS' environment variable or, failing that, a simple password
624+
`SSH_ASKPASS` environment variable or, failing that, a simple password
625625
prompt. The external program shall be given a suitable prompt as
626626
command-line argument and write the password on its STDOUT.
627627

@@ -1582,15 +1582,15 @@ guitool.<name>.confirm::
15821582

15831583
guitool.<name>.argPrompt::
15841584
Request a string argument from the user, and pass it to the tool
1585-
through the 'ARGS' environment variable. Since requesting an
1585+
through the `ARGS` environment variable. Since requesting an
15861586
argument implies confirmation, the 'confirm' option has no effect
15871587
if this is enabled. If the option is set to 'true', 'yes', or '1',
15881588
the dialog uses a built-in generic prompt; otherwise the exact
15891589
value of the variable is used.
15901590

15911591
guitool.<name>.revPrompt::
15921592
Request a single valid revision from the user, and set the
1593-
'REVISION' environment variable. In other aspects this option
1593+
`REVISION` environment variable. In other aspects this option
15941594
is similar to 'argPrompt', and can be used together with it.
15951595

15961596
guitool.<name>.revUnmerged::
@@ -2856,7 +2856,7 @@ url.<base>.pushInsteadOf::
28562856
user.email::
28572857
Your email address to be recorded in any newly created commits.
28582858
Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and
2859-
'EMAIL' environment variables. See linkgit:git-commit-tree[1].
2859+
`EMAIL` environment variables. See linkgit:git-commit-tree[1].
28602860

28612861
user.name::
28622862
Your full name to be recorded in any newly created commits.

Documentation/date-formats.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DATE FORMATS
22
------------
33

4-
The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables
4+
The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables
55
ifdef::git-commit[]
66
and the `--date` option
77
endif::git-commit[]

Documentation/diff-generate-patch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ with a '-p' option, "git diff" without the '--raw' option, or
66
"git log" with the "-p" option, they
77
do not produce the output described above; instead they produce a
88
patch file. You can customize the creation of such patches via the
9-
GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.
9+
`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables.
1010

1111
What the -p option produces is slightly different from the traditional
1212
diff format:

Documentation/git-bisect-lk2009.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ skip" to do the same thing. (In fact the special exit code 125 makes
366366

367367
Or if you want more control, you can inspect the current state using
368368
for example "git bisect visualize". It will launch gitk (or "git log"
369-
if the DISPLAY environment variable is not set) to help you find a
369+
if the `DISPLAY` environment variable is not set) to help you find a
370370
better bisection point.
371371

372372
Either way, if you have a string of untestable commits, it might

Documentation/git-bisect.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ $ git bisect visualize
205205

206206
`view` may also be used as a synonym for `visualize`.
207207

208-
If the 'DISPLAY' environment variable is not set, 'git log' is used
208+
If the `DISPLAY` environment variable is not set, 'git log' is used
209209
instead. You can also give command-line options such as `-p` and
210210
`--stat`.
211211

Documentation/git-commit.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ include::i18n.txt[]
449449
ENVIRONMENT AND CONFIGURATION VARIABLES
450450
---------------------------------------
451451
The editor used to edit the commit log message will be chosen from the
452-
GIT_EDITOR environment variable, the core.editor configuration variable, the
453-
VISUAL environment variable, or the EDITOR environment variable (in that
452+
`GIT_EDITOR` environment variable, the core.editor configuration variable, the
453+
`VISUAL` environment variable, or the `EDITOR` environment variable (in that
454454
order). See linkgit:git-var[1] for details.
455455

456456
HOOKS

Documentation/git-config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ and '--unset'. *'git config' will only ever change one file at a time*.
269269

270270
You can override these rules either by command-line options or by environment
271271
variables. The '--global' and the '--system' options will limit the file used
272-
to the global or system-wide file respectively. The GIT_CONFIG environment
272+
to the global or system-wide file respectively. The `GIT_CONFIG` environment
273273
variable has a similar effect, but you can specify any filename you want.
274274

275275

Documentation/git-daemon.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Git configuration files in that directory are readable by `<user>`.
188188
arguments. The external command can decide to decline the
189189
service by exiting with a non-zero status (or to allow it by
190190
exiting with a zero status). It can also look at the $REMOTE_ADDR
191-
and $REMOTE_PORT environment variables to learn about the
191+
and `$REMOTE_PORT` environment variables to learn about the
192192
requestor when making this decision.
193193
+
194194
The external command can optionally write a single line to its

Documentation/git-filter-branch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Filters
6161
The filters are applied in the order as listed below. The <command>
6262
argument is always evaluated in the shell context using the 'eval' command
6363
(with the notable exception of the commit filter, for technical reasons).
64-
Prior to that, the $GIT_COMMIT environment variable will be set to contain
64+
Prior to that, the `$GIT_COMMIT` environment variable will be set to contain
6565
the id of the commit being rewritten. Also, GIT_AUTHOR_NAME,
6666
GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL,
6767
and GIT_COMMITTER_DATE are taken from the current commit and exported to

Documentation/git-help.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ will try to use konqueror first. But this may fail (for example, if
128128
DISPLAY is not set) and in that case emacs' woman mode will be tried.
129129

130130
If everything fails, or if no viewer is configured, the viewer specified
131-
in the GIT_MAN_VIEWER environment variable will be tried. If that
131+
in the `GIT_MAN_VIEWER` environment variable will be tried. If that
132132
fails too, the 'man' program will be tried anyway.
133133

134134
man.<tool>.path

0 commit comments

Comments
 (0)