documentation: fix capitalization
Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f4e1851a29
commit
2150b6fb47
@ -30,7 +30,7 @@ checkout.workers::
|
|||||||
all commands that perform checkout. E.g. checkout, clone, reset,
|
all commands that perform checkout. E.g. checkout, clone, reset,
|
||||||
sparse-checkout, etc.
|
sparse-checkout, etc.
|
||||||
+
|
+
|
||||||
Note: parallel checkout usually delivers better performance for repositories
|
Note: Parallel checkout usually delivers better performance for repositories
|
||||||
located on SSDs or over NFS. For repositories on spinning disks and/or machines
|
located on SSDs or over NFS. For repositories on spinning disks and/or machines
|
||||||
with a small number of cores, the default sequential checkout often performs
|
with a small number of cores, the default sequential checkout often performs
|
||||||
better. The size and compression level of a repository might also influence how
|
better. The size and compression level of a repository might also influence how
|
||||||
|
@ -40,7 +40,7 @@ user.signingKey::
|
|||||||
your private ssh key or the public key when ssh-agent is used.
|
your private ssh key or the public key when ssh-agent is used.
|
||||||
Alternatively it can contain a public key prefixed with `key::`
|
Alternatively it can contain a public key prefixed with `key::`
|
||||||
directly (e.g.: "key::ssh-rsa XXXXXX identifier"). The private key
|
directly (e.g.: "key::ssh-rsa XXXXXX identifier"). The private key
|
||||||
needs to be available via ssh-agent. If not set git will call
|
needs to be available via ssh-agent. If not set Git will call
|
||||||
gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the
|
gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the
|
||||||
first key available. For backward compatibility, a raw key which
|
first key available. For backward compatibility, a raw key which
|
||||||
begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated
|
begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated
|
||||||
|
@ -34,10 +34,10 @@ include::diff-options.txt[]
|
|||||||
matching one of the provided pathspecs.
|
matching one of the provided pathspecs.
|
||||||
|
|
||||||
-r::
|
-r::
|
||||||
recurse into sub-trees
|
Recurse into sub-trees
|
||||||
|
|
||||||
-t::
|
-t::
|
||||||
show tree entry itself as well as subtrees. Implies -r.
|
Show tree entry itself as well as subtrees. Implies -r.
|
||||||
|
|
||||||
--root::
|
--root::
|
||||||
When `--root` is specified the initial commit will be shown as a big
|
When `--root` is specified the initial commit will be shown as a big
|
||||||
|
@ -32,7 +32,7 @@ OPTIONS
|
|||||||
-------
|
-------
|
||||||
|
|
||||||
--to-stdin::
|
--to-stdin::
|
||||||
For "run"; Specify a file which will be streamed into the
|
For "run"; specify a file which will be streamed into the
|
||||||
hook's stdin. The hook will receive the entire file from
|
hook's stdin. The hook will receive the entire file from
|
||||||
beginning to EOF.
|
beginning to EOF.
|
||||||
|
|
||||||
|
@ -28,22 +28,22 @@ to define the operation mode for the functions listed below.
|
|||||||
FUNCTIONS
|
FUNCTIONS
|
||||||
---------
|
---------
|
||||||
get_merge_tool::
|
get_merge_tool::
|
||||||
returns a merge tool. the return code is 1 if we returned a guessed
|
Returns a merge tool. The return code is 1 if we returned a guessed
|
||||||
merge tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to
|
merge tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to
|
||||||
search for the appropriate guitool.
|
search for the appropriate guitool.
|
||||||
|
|
||||||
get_merge_tool_cmd::
|
get_merge_tool_cmd::
|
||||||
returns the custom command for a merge tool.
|
Returns the custom command for a merge tool.
|
||||||
|
|
||||||
get_merge_tool_path::
|
get_merge_tool_path::
|
||||||
returns the custom path for a merge tool.
|
Returns the custom path for a merge tool.
|
||||||
|
|
||||||
initialize_merge_tool::
|
initialize_merge_tool::
|
||||||
bring merge tool specific functions into scope so they can be used or
|
Brings merge tool specific functions into scope so they can be used or
|
||||||
overridden.
|
overridden.
|
||||||
|
|
||||||
run_merge_tool::
|
run_merge_tool::
|
||||||
launches a merge tool given the tool name and a true/false
|
Launches a merge tool given the tool name and a true/false
|
||||||
flag to indicate whether a merge base is present.
|
flag to indicate whether a merge base is present.
|
||||||
'$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined
|
'$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined
|
||||||
for use by the merge tool.
|
for use by the merge tool.
|
||||||
|
@ -29,7 +29,7 @@ With no arguments, this will:
|
|||||||
In the case where the input consists entirely of whitespace characters, no
|
In the case where the input consists entirely of whitespace characters, no
|
||||||
output will be produced.
|
output will be produced.
|
||||||
|
|
||||||
*NOTE*: This is intended for cleaning metadata, prefer the `--whitespace=fix`
|
*NOTE*: This is intended for cleaning metadata. Prefer the `--whitespace=fix`
|
||||||
mode of linkgit:git-apply[1] for correcting whitespace of patches or files in
|
mode of linkgit:git-apply[1] for correcting whitespace of patches or files in
|
||||||
the repository.
|
the repository.
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ OPTIONS
|
|||||||
-------
|
-------
|
||||||
-f::
|
-f::
|
||||||
--force::
|
--force::
|
||||||
update the info files from scratch.
|
Update the info files from scratch.
|
||||||
|
|
||||||
OUTPUT
|
OUTPUT
|
||||||
------
|
------
|
||||||
|
@ -175,7 +175,7 @@ log_index*
|
|||||||
footer
|
footer
|
||||||
....
|
....
|
||||||
|
|
||||||
in a log-only file the first log block immediately follows the file
|
In a log-only file the first log block immediately follows the file
|
||||||
header, without padding to block alignment.
|
header, without padding to block alignment.
|
||||||
|
|
||||||
Block size
|
Block size
|
||||||
|
Loading…
Reference in New Issue
Block a user