Skip to content

Commit

Permalink
documentation: fix capitalization
Browse files Browse the repository at this point in the history
Diff best viewed with --color-diff.

Signed-off-by: Elijah Newren <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
newren authored and gitster committed Oct 9, 2023
1 parent f4e1851 commit 2150b6f
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Documentation/config/checkout.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ checkout.workers::
all commands that perform checkout. E.g. checkout, clone, reset,
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
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
Expand Down
2 changes: 1 addition & 1 deletion Documentation/config/user.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ user.signingKey::
your private ssh key or the public key when ssh-agent is used.
Alternatively it can contain a public key prefixed with `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
first key available. For backward compatibility, a raw key which
begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated
Expand Down
4 changes: 2 additions & 2 deletions Documentation/git-diff-tree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ include::diff-options.txt[]
matching one of the provided pathspecs.

-r::
recurse into sub-trees
Recurse into sub-trees

-t::
show tree entry itself as well as subtrees. Implies -r.
Show tree entry itself as well as subtrees. Implies -r.

--root::
When `--root` is specified the initial commit will be shown as a big
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-hook.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ OPTIONS
-------

--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
beginning to EOF.

Expand Down
10 changes: 5 additions & 5 deletions Documentation/git-mergetool--lib.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ to define the operation mode for the functions listed below.
FUNCTIONS
---------
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
search for the appropriate guitool.

get_merge_tool_cmd::
returns the custom command for a merge tool.
Returns the custom command for a merge tool.

get_merge_tool_path::
returns the custom path for a merge tool.
Returns the custom path for a 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.

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.
'$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined
for use by the merge tool.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-stripspace.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ With no arguments, this will:
In the case where the input consists entirely of whitespace characters, no
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
the repository.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-update-server-info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ OPTIONS
-------
-f::
--force::
update the info files from scratch.
Update the info files from scratch.

OUTPUT
------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/technical/reftable.txt
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ log_index*
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.

Block size
Expand Down

0 comments on commit 2150b6f

Please sign in to comment.