diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:29 -0700 |
| commit | dbe33c5ad02aa9a6141abccf0821b49c46df2891 (patch) | |
| tree | 075cee0657dce17bac66a3adda13be5b15a0ca1c /Documentation/config | |
| parent | 384f7d17d2f0d0ca689d8dda16f752c75a8ac634 (diff) | |
| download | git-dbe33c5ad02aa9a6141abccf0821b49c46df2891.tar.gz | |
documentation: fix apostrophe usage
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/index.txt | 2 | ||||
| -rw-r--r-- | Documentation/config/pack.txt | 2 | ||||
| -rw-r--r-- | Documentation/config/submodule.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config/index.txt b/Documentation/config/index.txt index 23c7985eb4..3eff420360 100644 --- a/Documentation/config/index.txt +++ b/Documentation/config/index.txt @@ -23,7 +23,7 @@ index.threads:: Specifies the number of threads to spawn when loading the index. This is meant to reduce index load time on multiprocessor machines. Specifying 0 or 'true' will cause Git to auto-detect the number of - CPU's and set the number of threads accordingly. Specifying 1 or + CPUs and set the number of threads accordingly. Specifying 1 or 'false' will disable multithreading. Defaults to 'true'. index.version:: diff --git a/Documentation/config/pack.txt b/Documentation/config/pack.txt index dcd4c871b3..6308f21e03 100644 --- a/Documentation/config/pack.txt +++ b/Documentation/config/pack.txt @@ -74,7 +74,7 @@ pack.threads:: warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. - Specifying 0 will cause Git to auto-detect the number of CPU's + Specifying 0 will cause Git to auto-detect the number of CPUs and set the number of threads accordingly. pack.indexVersion:: diff --git a/Documentation/config/submodule.txt b/Documentation/config/submodule.txt index 665419fa13..0672d99117 100644 --- a/Documentation/config/submodule.txt +++ b/Documentation/config/submodule.txt @@ -35,7 +35,7 @@ submodule.<name>.ignore:: a submodule as modified. When set to "all", it will never be considered modified (but it will nonetheless show up in the output of status and commit when it has been staged), "dirty" will ignore all changes - to the submodules work tree and + to the submodule's work tree and takes only differences between the HEAD of the submodule and the commit recorded in the superproject into account. "untracked" will additionally let submodules with modified tracked files in their work tree show up. |