aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/config
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-10-08 06:45:07 +0000
committerJunio C Hamano <gitster@pobox.com>2023-10-09 12:06:29 -0700
commit89363522424a27b2e43c74a7965566d943cbdba4 (patch)
treeb57dd5a4a5c4739869652d981e19ed557238f629 /Documentation/config
parentdbe33c5ad02aa9a6141abccf0821b49c46df2891 (diff)
downloadgit-89363522424a27b2e43c74a7965566d943cbdba4.tar.gz
documentation: add missing words
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/advice.txt2
-rw-r--r--Documentation/config/checkout.txt2
-rw-r--r--Documentation/config/http.txt2
-rw-r--r--Documentation/config/mergetool.txt2
-rw-r--r--Documentation/config/sendemail.txt2
5 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index c548a91e67..f4864a2d58 100644
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -101,7 +101,7 @@ advice.*::
otherwise caused a remote-tracking branch to be
checked out. See the `checkout.defaultRemote`
configuration variable for how to set a given remote
- to used by default in some situations where this
+ to be used by default in some situations where this
advice would be printed.
amWorkDir::
Advice that shows the location of the patch file when
diff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt
index bfbca90f0e..a54faab238 100644
--- a/Documentation/config/checkout.txt
+++ b/Documentation/config/checkout.txt
@@ -39,6 +39,6 @@ well the parallel version performs.
checkout.thresholdForParallelism::
When running parallel checkout with a small number of files, the cost
of subprocess spawning and inter-process communication might outweigh
- the parallelization gains. This setting allows to define the minimum
+ the parallelization gains. This setting allows you to define the minimum
number of files for which parallel checkout should be attempted. The
default is 100.
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index 1d805fdddb..2d4e0c9b86 100644
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -254,7 +254,7 @@ http.lowSpeedLimit, http.lowSpeedTime::
http.noEPSV::
A boolean which disables using of EPSV ftp command by curl.
- This can helpful with some "poor" ftp servers which don't
+ This can be helpful with some "poor" ftp servers which don't
support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV`
environment variable. Default is false (curl will use EPSV).
diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
index e9abde9d60..fe4ba0271b 100644
--- a/Documentation/config/mergetool.txt
+++ b/Documentation/config/mergetool.txt
@@ -22,7 +22,7 @@ mergetool.<tool>.trustExitCode::
For a custom merge command, specify whether the exit code of
the merge command can be used to determine whether the merge was
successful. If this is not set to true then the merge target file
- timestamp is checked and the merge assumed to have been successful
+ timestamp is checked and the merge is assumed to have been successful
if the file has been updated, otherwise the user is prompted to
indicate the success of the merge.
diff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt
index 92a9ebe98c..51b1b5fe7e 100644
--- a/Documentation/config/sendemail.txt
+++ b/Documentation/config/sendemail.txt
@@ -91,7 +91,7 @@ sendemail.smtpBatchSize::
See also the `--batch-size` option of linkgit:git-send-email[1].
sendemail.smtpReloginDelay::
- Seconds wait before reconnecting to smtp server.
+ Seconds to wait before reconnecting to smtp server.
See also the `--relogin-delay` option of linkgit:git-send-email[1].
sendemail.forbidSendmailVariables::