{"thread":{"id":"60323","subject":"[PATCH 03/25] documentation: fix typos","startedAt":"2023-10-08T06:45:45Z","lastAt":"2023-10-16T21:54:11Z","messageCount":32,"participants":["Elijah Newren via GitGitGadget","Ramsay Jones","Taylor Blau","Elijah Newren","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":25},"messages":[{"id":"482792","messageId":"fffcf580b29153a3c4c7ead3abfb2b621d3a0d46.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 03/25] documentation: fix typos","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:05Z","receivedAt":"2023-10-08T06:45:45Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/fsck-msgids.txt | 2 +-\n Documentation/git-get-tar-commit-id.txt | 2 +-\n Documentation/git-grep.txt | 2 +-\n Documentation/git-upload-pack.txt | 2 +-\n Documentation/gitformat-chunk.txt | 2 +-\n Documentation/gitformat-pack.txt | 4 ++--\n Documentation/gitprotocol-capabilities.txt | 2 +-\n Documentation/technical/commit-graph.txt | 2 +-\n Documentation/technical/parallel-checkout.txt | 4 ++--\n 9 files changed, 11 insertions(+), 11 deletions(-)\n\ndiff --git a/Documentation/fsck-msgids.txt b/Documentation/fsck-msgids.txt\nindex 09b0aecbf86..8505c244bcf 100644\n--- a/Documentation/fsck-msgids.txt\n+++ b/Documentation/fsck-msgids.txt\n@@ -174,7 +174,7 @@\n \t(FATAL) Missing end-of-line in the object header.\n \n `zeroPaddedDate`::\n-\t(ERROR) Found a zero padded date in an author/commiter line.\n+\t(ERROR) Found a zero padded date in an author/committer line.\n \n `zeroPaddedFilemode`::\n \t(WARN) Found a zero padded filemode in a tree.\ndiff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.txt\nindex ac44d85b0b5..b537bb45b13 100644\n--- a/Documentation/git-get-tar-commit-id.txt\n+++ b/Documentation/git-get-tar-commit-id.txt\n@@ -20,7 +20,7 @@ and extract the commit ID stored in it. It reads only the first\n 1024 bytes of input, thus its runtime is not influenced by the size\n of the tar archive very much.\n \n-If no commit ID is found, 'git get-tar-commit-id' quietly exists with a\n+If no commit ID is found, 'git get-tar-commit-id' quietly exits with a\n return code of 1. This can happen if the archive had not been created\n using 'git archive' or if the first parameter of 'git archive' had been\n a tree ID instead of a commit ID or tag.\ndiff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt\nindex dabdbe8471d..0d0103c780a 100644\n--- a/Documentation/git-grep.txt\n+++ b/Documentation/git-grep.txt\n@@ -337,7 +337,7 @@ The `--threads` option (and the grep.threads configuration) will be ignored when\n \n When grepping the object store (with `--cached` or giving tree objects), running\n with multiple threads might perform slower than single threaded if `--textconv`\n-is given and there're too many text conversions. So if you experience low\n+is given and there are too many text conversions. So if you experience low\n performance in this case, it might be desirable to use `--threads=1`.\n \n CONFIGURATION\ndiff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt\nindex b656b475675..7ad60bc3485 100644\n--- a/Documentation/git-upload-pack.txt\n+++ b/Documentation/git-upload-pack.txt\n@@ -26,7 +26,7 @@ OPTIONS\n -------\n \n --[no-]strict::\n-\tDo not try /.git/ if is no Git directory.\n+\tDo not try /.git/ if is not a Git directory.\n \n --timeout=::\n \tInterrupt transfer after seconds of inactivity.\ndiff --git a/Documentation/gitformat-chunk.txt b/Documentation/gitformat-chunk.txt\nindex 57202ede273..76ea678398a 100644\n--- a/Documentation/gitformat-chunk.txt\n+++ b/Documentation/gitformat-chunk.txt\n@@ -42,7 +42,7 @@ Each row consists of a 4-byte chunk identifier (ID) and an 8-byte offset.\n Each integer is stored in network-byte order.\n \n The chunk identifier `ID[i]` is a label for the data stored within this\n-fill from `OFFSET[i]` (inclusive) to `OFFSET[i+1]` (exclusive). Thus, the\n+file from `OFFSET[i]` (inclusive) to `OFFSET[i+1]` (exclusive). Thus, the\n size of the `i`th chunk is equal to the difference between `OFFSET[i+1]`\n and `OFFSET[i]`. This requires that the chunk data appears contiguously\n in the same order as the table of contents.\ndiff --git a/Documentation/gitformat-pack.txt b/Documentation/gitformat-pack.txt\nindex 870e00f2982..42afb953e8c 100644\n--- a/Documentation/gitformat-pack.txt\n+++ b/Documentation/gitformat-pack.txt\n@@ -17,8 +17,8 @@ $GIT_DIR/objects/pack/multi-pack-index\n DESCRIPTION\n -----------\n \n-The Git pack format is now Git stores most of its primary repository\n-data. Over the lietime af a repository loose objects (if any) and\n+The Git pack format is how Git stores most of its primary repository\n+data. Over the lietime of a repository loose objects (if any) and\n smaller packs are consolidated into larger pack(s). See\n linkgit:git-gc[1] and linkgit:git-pack-objects[1].\n \ndiff --git a/Documentation/gitprotocol-capabilities.txt b/Documentation/gitprotocol-capabilities.txt\nindex 5d5e39a7039..9adda577e51 100644\n--- a/Documentation/gitprotocol-capabilities.txt\n+++ b/Documentation/gitprotocol-capabilities.txt\n@@ -273,7 +273,7 @@ request include-tag only has to do with the client's desires for tag\n data, whether or not a server had advertised objects in the\n refs/tags/* namespace.\n \n-Servers MUST pack the tags if their referrant is packed and the client\n+Servers MUST pack the tags if their referent is packed and the client\n has requested include-tags.\n \n Clients MUST be prepared for the case where a server has ignored\ndiff --git a/Documentation/technical/commit-graph.txt b/Documentation/technical/commit-graph.txt\nindex 86fed0de0f7..2c26e95e51a 100644\n--- a/Documentation/technical/commit-graph.txt\n+++ b/Documentation/technical/commit-graph.txt\n@@ -136,7 +136,7 @@ Design Details\n \n - Commit grafts and replace objects can change the shape of the commit\n history. The latter can also be enabled/disabled on the fly using\n- `--no-replace-objects`. This leads to difficultly storing both possible\n+ `--no-replace-objects`. This leads to difficulty storing both possible\n interpretations of a commit id, especially when computing generation\n numbers. The commit-graph will not be read or written when\n replace-objects or grafts are present.\ndiff --git a/Documentation/technical/parallel-checkout.txt b/Documentation/technical/parallel-checkout.txt\nindex 91a5eb26efd..1a5fe09b51d 100644\n--- a/Documentation/technical/parallel-checkout.txt\n+++ b/Documentation/technical/parallel-checkout.txt\n@@ -148,7 +148,7 @@ information, the main process handles the results in two steps:\n \n - First, it updates the in-memory index with the `lstat()` information\n sent by the workers. (This must be done first as this information\n- might me required in the following step.)\n+ might be required in the following step.)\n \n - Then it writes the items which collided on disk (i.e. items marked\n with `PC_ITEM_COLLIDED`). More on this below.\n@@ -232,7 +232,7 @@ conversion and re-encoding, are eligible for parallel checkout.\n Ineligible entries are checked out by the classic sequential codepath\n *before* spawning workers.\n \n-Note: submodules's files are also eligible for parallel checkout (as\n+Note: submodules' files are also eligible for parallel checkout (as\n long as they don't fall into any of the excluding categories mentioned\n above). But since each submodule is checked out in its own child\n process, we don't mix the superproject's and the submodules' files in\n-- \ngitgitgadget\n\n"},{"id":"482793","messageId":"pull.1595.git.1696747527.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":null,"subject":"[PATCH 00/25] Documentation fixes","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:02Z","receivedAt":"2023-10-08T06:45:45Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"It turns out that AI is pretty good at making small fixes to documentation;\ncertainly not perfect, but it provides quite good signal. Unfortunately,\nthere is a lot to sift through. Some points about my strategy:\n\n * I ignored a few categories of things like British vs. American spellings\n (though being consistent on that might be a nice change)\n\n * I dropped many changes where I thought there wasn't an issue being\n corrected but just a switch of style being suggested (though I accepted a\n number of these types of changes before later deciding to drop them).\n\n * I also started discarding lower priority changes like comma placement. I\n accepted a number of these that I thought made the documentation clearer,\n but I eventually just started dropping them as I had spent far more hours\n than I expected on this series.\n\n * A few of the changes AI suggested were bad (it really shouldn't mess with\n protocol and RFC-like text). Definitely was useful to review.\n\n * Occasionally I noticed an even better improvement and tweaked the text\n accordingly.\n\nI did review every single change here, multiple times, and I have tried to\nsplit up this series in a way to make it easier to review. In particular I:\n\n * dropped any changes that conflicted with anything in next or seen. I may\n resubmit some of those later.\n\n * split it into a bunch of patches based on various grammatical rules being\n corrected\n\n * sometimes when a single line had multiple types of changes, I split the\n fixes across multiple patches in order to group types of changes\n\n * sometimes splitting the single-line changes seemed like too much, and I\n just combined the multiple changes to a single line with the first patch\n in the series, \"wording improvements\".\n\nLet me know if there are other changes that would make this easier to\nreview. In a sense, though, it's already had multiple eyes looking at this,\nit's just that one pair of those eyes were artificial. :-)\n\n(Note: every patch in this series, except for the whitespace fixes patch,\nare best viewed with --color-words.)\n\nElijah Newren (25):\n documentation: wording improvements\n documentation: fix small error\n documentation: fix typos\n documentation: fix apostrophe usage\n documentation: add missing words\n documentation: remove extraneous words\n documentation: fix subject/verb agreement\n documentation: employ consistent verb tense for a list\n documentation: fix verb tense\n documentation: fix adjective vs. noun\n documentation: fix verb vs. noun\n documentation: fix singular vs. plural\n documentation: whitespace is already generally plural\n documentation: fix choice of article\n documentation: add missing article\n documentation: remove unnecessary hyphens\n documentation: add missing hyphens\n documentation: use clearer prepositions\n documentation: fix punctuation\n documentation: fix capitalization\n documentation: fix whitespace issues\n documentation: add some commas where they are helpful\n documentation: add missing fullstops\n documentation: add missing quotes\n documentation: add missing parenthesis\n\n Documentation/CodingGuidelines | 6 ++---\n Documentation/ReviewingGuidelines.txt | 4 +--\n Documentation/SubmittingPatches | 2 +-\n Documentation/ToolsForGit.txt | 4 +--\n Documentation/config.txt | 6 ++---\n Documentation/config/advice.txt | 8 +++---\n Documentation/config/alias.txt | 2 +-\n Documentation/config/apply.txt | 4 +--\n Documentation/config/branch.txt | 6 ++---\n Documentation/config/checkout.txt | 4 +--\n Documentation/config/clean.txt | 2 +-\n Documentation/config/clone.txt | 4 +--\n Documentation/config/color.txt | 2 +-\n Documentation/config/column.txt | 4 +--\n Documentation/config/commit.txt | 4 +--\n Documentation/config/credential.txt | 4 +--\n Documentation/config/diff.txt | 2 +-\n Documentation/config/fastimport.txt | 4 +--\n Documentation/config/fetch.txt | 4 +--\n Documentation/config/format.txt | 2 +-\n Documentation/config/fsck.txt | 22 ++++++++--------\n Documentation/config/fsmonitor--daemon.txt | 2 +-\n Documentation/config/gc.txt | 4 +--\n Documentation/config/gpg.txt | 6 ++---\n Documentation/config/gui.txt | 2 +-\n Documentation/config/http.txt | 4 +--\n Documentation/config/i18n.txt | 2 +-\n Documentation/config/imap.txt | 4 +--\n Documentation/config/index.txt | 2 +-\n Documentation/config/log.txt | 2 +-\n Documentation/config/mailinfo.txt | 2 +-\n Documentation/config/maintenance.txt | 2 +-\n Documentation/config/man.txt | 2 +-\n Documentation/config/merge.txt | 2 +-\n Documentation/config/mergetool.txt | 12 ++++-----\n Documentation/config/notes.txt | 2 +-\n Documentation/config/pack.txt | 10 +++----\n Documentation/config/push.txt | 4 +--\n Documentation/config/receive.txt | 4 +--\n Documentation/config/rerere.txt | 2 +-\n Documentation/config/safe.txt | 4 +--\n Documentation/config/sendemail.txt | 4 +--\n Documentation/config/sequencer.txt | 2 +-\n Documentation/config/splitindex.txt | 6 ++---\n Documentation/config/stash.txt | 8 +++---\n Documentation/config/status.txt | 4 +--\n Documentation/config/submodule.txt | 4 +--\n Documentation/config/trace2.txt | 2 +-\n Documentation/config/transfer.txt | 4 +--\n Documentation/config/user.txt | 10 +++----\n Documentation/config/versionsort.txt | 6 ++---\n Documentation/diff-generate-patch.txt | 26 +++++++++----------\n Documentation/diff-options.txt | 2 +-\n Documentation/fetch-options.txt | 4 +--\n Documentation/fsck-msgids.txt | 4 +--\n Documentation/git-am.txt | 12 ++++-----\n Documentation/git-apply.txt | 14 +++++-----\n Documentation/git-archive.txt | 16 ++++++------\n Documentation/git-blame.txt | 8 +++---\n Documentation/git-bugreport.txt | 9 ++++---\n Documentation/git-check-attr.txt | 6 ++---\n Documentation/git-check-ignore.txt | 2 +-\n Documentation/git-check-ref-format.txt | 4 +--\n Documentation/git-checkout-index.txt | 10 +++----\n Documentation/git-checkout.txt | 2 +-\n Documentation/git-clean.txt | 2 +-\n Documentation/git-count-objects.txt | 6 ++---\n Documentation/git-credential-cache.txt | 2 +-\n Documentation/git-credential-store.txt | 2 +-\n Documentation/git-credential.txt | 2 +-\n Documentation/git-daemon.txt | 2 +-\n Documentation/git-diff-files.txt | 6 ++---\n Documentation/git-diff-index.txt | 4 +--\n Documentation/git-diff-tree.txt | 12 ++++-----\n Documentation/git-difftool.txt | 4 +--\n Documentation/git-fast-import.txt | 4 +--\n Documentation/git-fetch-pack.txt | 2 +-\n Documentation/git-format-patch.txt | 2 +-\n Documentation/git-fsck.txt | 6 ++---\n Documentation/git-fsmonitor--daemon.txt | 10 +++----\n Documentation/git-get-tar-commit-id.txt | 2 +-\n Documentation/git-grep.txt | 2 +-\n Documentation/git-hash-object.txt | 8 +++---\n Documentation/git-help.txt | 18 ++++++-------\n Documentation/git-hook.txt | 4 +--\n Documentation/git-http-backend.txt | 10 +++----\n Documentation/git-http-fetch.txt | 2 +-\n Documentation/git-http-push.txt | 10 +++----\n Documentation/git-index-pack.txt | 10 +++----\n Documentation/git-init.txt | 10 +++----\n Documentation/git-ls-files.txt | 10 +++----\n Documentation/git-mailsplit.txt | 2 +-\n Documentation/git-maintenance.txt | 6 ++---\n Documentation/git-merge-base.txt | 12 ++++-----\n Documentation/git-merge-tree.txt | 8 +++---\n Documentation/git-merge.txt | 2 +-\n Documentation/git-mergetool--lib.txt | 10 +++----\n Documentation/git-mergetool.txt | 8 +++---\n Documentation/git-mktag.txt | 6 ++---\n Documentation/git-mktree.txt | 4 +--\n Documentation/git-mv.txt | 2 +-\n Documentation/git-name-rev.txt | 2 +-\n Documentation/git-prune-packed.txt | 2 +-\n Documentation/git-prune.txt | 2 +-\n Documentation/git-push.txt | 2 +-\n Documentation/git-quiltimport.txt | 4 +--\n Documentation/git-range-diff.txt | 2 +-\n Documentation/git-read-tree.txt | 6 ++---\n Documentation/git-receive-pack.txt | 4 +--\n Documentation/git-remote-ext.txt | 10 +++----\n Documentation/git-remote-fd.txt | 10 +++----\n Documentation/git-repack.txt | 4 +--\n Documentation/git-replace.txt | 4 +--\n Documentation/git-request-pull.txt | 4 +--\n Documentation/git-restore.txt | 4 +--\n Documentation/git-rev-list.txt | 4 +--\n Documentation/git-rev-parse.txt | 8 +++---\n Documentation/git-rm.txt | 2 +-\n Documentation/git-send-email.txt | 4 +--\n Documentation/git-send-pack.txt | 16 ++++++------\n Documentation/git-sh-setup.txt | 2 +-\n Documentation/git-show-branch.txt | 12 ++++-----\n Documentation/git-show-ref.txt | 2 +-\n Documentation/git-show.txt | 2 +-\n Documentation/git-status.txt | 2 +-\n Documentation/git-stripspace.txt | 6 ++---\n Documentation/git-symbolic-ref.txt | 2 +-\n Documentation/git-update-index.txt | 18 ++++++-------\n Documentation/git-update-ref.txt | 2 +-\n Documentation/git-update-server-info.txt | 4 +--\n Documentation/git-upload-pack.txt | 2 +-\n Documentation/git-var.txt | 2 +-\n Documentation/git-verify-pack.txt | 6 ++---\n Documentation/git-whatchanged.txt | 8 +++---\n Documentation/gitcli.txt | 8 +++---\n Documentation/gitdiffcore.txt | 14 +++++-----\n Documentation/giteveryday.txt | 2 +-\n Documentation/gitformat-bundle.txt | 8 +++---\n Documentation/gitformat-chunk.txt | 4 +--\n Documentation/gitformat-pack.txt | 18 ++++++-------\n Documentation/githooks.txt | 10 +++----\n Documentation/gitprotocol-capabilities.txt | 20 +++++++-------\n Documentation/gitprotocol-common.txt | 2 +-\n Documentation/gitprotocol-http.txt | 6 ++---\n Documentation/gitprotocol-pack.txt | 6 ++---\n Documentation/gitprotocol-v2.txt | 2 +-\n Documentation/gitsubmodules.txt | 6 ++---\n Documentation/gitweb.conf.txt | 2 +-\n Documentation/gitweb.txt | 16 ++++++------\n Documentation/glossary-content.txt | 2 +-\n .../howto/coordinate-embargoed-releases.txt | 2 +-\n Documentation/howto/maintain-git.txt | 6 ++---\n Documentation/howto/use-git-daemon.txt | 2 +-\n Documentation/howto/using-merge-subtree.txt | 2 +-\n Documentation/i18n.txt | 4 +--\n Documentation/mergetools/vimdiff.txt | 6 ++---\n Documentation/pretty-options.txt | 4 +--\n Documentation/pull-fetch-param.txt | 6 ++---\n Documentation/rev-list-options.txt | 4 +--\n Documentation/technical/api-index-skel.txt | 2 +-\n Documentation/technical/api-simple-ipc.txt | 10 +++----\n Documentation/technical/bitmap-format.txt | 6 ++---\n Documentation/technical/commit-graph.txt | 2 +-\n Documentation/technical/parallel-checkout.txt | 10 +++----\n Documentation/technical/partial-clone.txt | 8 +++---\n Documentation/technical/racy-git.txt | 10 +++----\n Documentation/technical/reftable.txt | 10 +++----\n .../technical/repository-version.txt | 2 +-\n Documentation/technical/rerere.txt | 6 ++---\n Documentation/urls-remotes.txt | 4 +--\n Documentation/urls.txt | 4 +--\n 171 files changed, 478 insertions(+), 477 deletions(-)\n\n\nbase-commit: 3a06386e314565108ad56a9bdb8f7b80ac52fb69\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1595%2Fnewren%2Fdoc-fixes-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1595/newren/doc-fixes-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1595\n-- \ngitgitgadget\n"},{"id":"482794","messageId":"4ab68e372343721c4b68fb33b64ef44c56d1447a.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 02/25] documentation: fix small error","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:04Z","receivedAt":"2023-10-08T06:45:46Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config/fsck.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt\nindex fec3eefb5b8..9b167575530 100644\n--- a/Documentation/config/fsck.txt\n+++ b/Documentation/config/fsck.txt\n@@ -11,7 +11,7 @@ to clone or fetch it set `fetch.fsck.`.\n +\n The rest of the documentation discusses `fsck.*` for brevity, but the\n same applies for the corresponding `receive.fsck.*` and\n-`fetch..*`. variables.\n+`fetch.fsck.*`. variables.\n +\n Unlike variables like `color.ui` and `core.editor` the\n `receive.fsck.` and `fetch.fsck.` variables will not\n-- \ngitgitgadget\n\n"},{"id":"482795","messageId":"5ea4a160bdeb55043ada7e2497b97aba449ed615.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 04/25] documentation: fix apostrophe usage","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:06Z","receivedAt":"2023-10-08T06:45:49Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config/index.txt | 2 +-\n Documentation/config/pack.txt | 2 +-\n Documentation/config/submodule.txt | 2 +-\n Documentation/git-mktag.txt | 2 +-\n Documentation/git-rm.txt | 2 +-\n Documentation/gitprotocol-pack.txt | 2 +-\n Documentation/pull-fetch-param.txt | 2 +-\n Documentation/technical/rerere.txt | 2 +-\n 8 files changed, 8 insertions(+), 8 deletions(-)\n\ndiff --git a/Documentation/config/index.txt b/Documentation/config/index.txt\nindex 23c7985eb40..3eff4203603 100644\n--- a/Documentation/config/index.txt\n+++ b/Documentation/config/index.txt\n@@ -23,7 +23,7 @@ index.threads::\n \tSpecifies the number of threads to spawn when loading the index.\n \tThis is meant to reduce index load time on multiprocessor machines.\n \tSpecifying 0 or 'true' will cause Git to auto-detect the number of\n-\tCPU's and set the number of threads accordingly. Specifying 1 or\n+\tCPUs and set the number of threads accordingly. Specifying 1 or\n \t'false' will disable multithreading. Defaults to 'true'.\n \n index.version::\ndiff --git a/Documentation/config/pack.txt b/Documentation/config/pack.txt\nindex dcd4c871b3a..6308f21e03d 100644\n--- a/Documentation/config/pack.txt\n+++ b/Documentation/config/pack.txt\n@@ -74,7 +74,7 @@ pack.threads::\n \twarning. This is meant to reduce packing time on multiprocessor\n \tmachines. The required amount of memory for the delta search window\n \tis however multiplied by the number of threads.\n-\tSpecifying 0 will cause Git to auto-detect the number of CPU's\n+\tSpecifying 0 will cause Git to auto-detect the number of CPUs\n \tand set the number of threads accordingly.\n \n pack.indexVersion::\ndiff --git a/Documentation/config/submodule.txt b/Documentation/config/submodule.txt\nindex 665419fa135..0672d991172 100644\n--- a/Documentation/config/submodule.txt\n+++ b/Documentation/config/submodule.txt\n@@ -35,7 +35,7 @@ submodule..ignore::\n \ta submodule as modified. When set to \"all\", it will never be considered\n \tmodified (but it will nonetheless show up in the output of status and\n \tcommit when it has been staged), \"dirty\" will ignore all changes\n-\tto the submodules work tree and\n+\tto the submodule's work tree and\n \ttakes only differences between the HEAD of the submodule and the commit\n \trecorded in the superproject into account. \"untracked\" will additionally\n \tlet submodules with modified tracked files in their work tree show up.\ndiff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt\nindex b2a2e80d421..cd8fe9169e8 100644\n--- a/Documentation/git-mktag.txt\n+++ b/Documentation/git-mktag.txt\n@@ -14,7 +14,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n \n-Reads a tag contents on standard input and creates a tag object. The\n+Reads a tag's contents on standard input and creates a tag object. The\n output is the new tag's identifier.\n \n This command is mostly equivalent to linkgit:git-hash-object[1]\ndiff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt\nindex 81bc23f3cdb..363a26934f5 100644\n--- a/Documentation/git-rm.txt\n+++ b/Documentation/git-rm.txt\n@@ -163,7 +163,7 @@ will be staged (unless --cached or -n are used).\n \n A submodule is considered up to date when the HEAD is the same as\n recorded in the index, no tracked files are modified and no untracked\n-files that aren't ignored are present in the submodules work tree.\n+files that aren't ignored are present in the submodule's work tree.\n Ignored files are deemed expendable and won't stop a submodule's work\n tree from being removed.\n \ndiff --git a/Documentation/gitprotocol-pack.txt b/Documentation/gitprotocol-pack.txt\nindex dd4108b7a3b..01391cb300d 100644\n--- a/Documentation/gitprotocol-pack.txt\n+++ b/Documentation/gitprotocol-pack.txt\n@@ -137,7 +137,7 @@ an absolute path in the remote filesystem.\n \t\t v\n ssh user@example.com \"git-upload-pack '/project.git'\"\n \n-In a \"user@host:path\" format URI, its relative to the user's home\n+In a \"user@host:path\" format URI, it's relative to the user's home\n directory, because the Git client will run:\n \n git clone user@example.com:project.git\ndiff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt\nindex 95a7390b2c7..26bf06d991b 100644\n--- a/Documentation/pull-fetch-param.txt\n+++ b/Documentation/pull-fetch-param.txt\n@@ -71,7 +71,7 @@ refspec (or `--force`).\n Unlike when pushing with linkgit:git-push[1], any updates outside of\n `refs/{tags,heads}/*` will be accepted without `+` in the refspec (or\n `--force`), whether that's swapping e.g. a tree object for a blob, or\n-a commit for another commit that's doesn't have the previous commit as\n+a commit for another commit that doesn't have the previous commit as\n an ancestor etc.\n +\n Unlike when pushing with linkgit:git-push[1], there is no\ndiff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt\nindex be58f1bee36..3f9259cb1e4 100644\n--- a/Documentation/technical/rerere.txt\n+++ b/Documentation/technical/rerere.txt\n@@ -76,7 +76,7 @@ examples would both result in the following normalized conflict:\n Sorting hunks\n ~~~~~~~~~~~~~\n \n-As before, lets imagine that a common ancestor had a file with line A\n+As before, let's imagine that a common ancestor had a file with line A\n its early part, and line X in its late part. And then four branches\n are forked that do these things:\n \n-- \ngitgitgadget\n\n"},{"id":"482796","messageId":"aa350fd858bc1eeddac67c4d678210f77fd9f0b8.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 05/25] documentation: add missing words","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:07Z","receivedAt":"2023-10-08T06:45:51Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config/advice.txt | 2 +-\n Documentation/config/checkout.txt | 2 +-\n Documentation/config/http.txt | 2 +-\n Documentation/config/mergetool.txt | 2 +-\n Documentation/config/sendemail.txt | 2 +-\n Documentation/git-checkout.txt | 2 +-\n Documentation/git-credential-cache.txt | 2 +-\n Documentation/git-credential-store.txt | 2 +-\n Documentation/git-difftool.txt | 2 +-\n Documentation/git-fetch-pack.txt | 2 +-\n Documentation/git-mktag.txt | 2 +-\n Documentation/git-prune-packed.txt | 2 +-\n Documentation/git-restore.txt | 2 +-\n Documentation/gitprotocol-v2.txt | 2 +-\n Documentation/howto/use-git-daemon.txt | 2 +-\n Documentation/technical/api-simple-ipc.txt | 2 +-\n Documentation/technical/partial-clone.txt | 2 +-\n Documentation/technical/racy-git.txt | 2 +-\n Documentation/technical/rerere.txt | 2 +-\n 19 files changed, 19 insertions(+), 19 deletions(-)\n\ndiff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt\nindex c548a91e676..f4864a2d58b 100644\n--- a/Documentation/config/advice.txt\n+++ b/Documentation/config/advice.txt\n@@ -101,7 +101,7 @@ advice.*::\n \t\totherwise caused a remote-tracking branch to be\n \t\tchecked out. See the `checkout.defaultRemote`\n \t\tconfiguration variable for how to set a given remote\n-\t\tto used by default in some situations where this\n+\t\tto be used by default in some situations where this\n \t\tadvice would be printed.\n \tamWorkDir::\n \t\tAdvice that shows the location of the patch file when\ndiff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt\nindex bfbca90f0e9..a54faab238a 100644\n--- a/Documentation/config/checkout.txt\n+++ b/Documentation/config/checkout.txt\n@@ -39,6 +39,6 @@ well the parallel version performs.\n checkout.thresholdForParallelism::\n \tWhen running parallel checkout with a small number of files, the cost\n \tof subprocess spawning and inter-process communication might outweigh\n-\tthe parallelization gains. This setting allows to define the minimum\n+\tthe parallelization gains. This setting allows you to define the minimum\n \tnumber of files for which parallel checkout should be attempted. The\n \tdefault is 100.\ndiff --git a/Documentation/config/http.txt b/Documentation/config/http.txt\nindex 1d805fdddbc..2d4e0c9b869 100644\n--- a/Documentation/config/http.txt\n+++ b/Documentation/config/http.txt\n@@ -254,7 +254,7 @@ http.lowSpeedLimit, http.lowSpeedTime::\n \n http.noEPSV::\n \tA boolean which disables using of EPSV ftp command by curl.\n-\tThis can helpful with some \"poor\" ftp servers which don't\n+\tThis can be helpful with some \"poor\" ftp servers which don't\n \tsupport EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV`\n \tenvironment variable. Default is false (curl will use EPSV).\n \ndiff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt\nindex e9abde9d60c..fe4ba0271b5 100644\n--- a/Documentation/config/mergetool.txt\n+++ b/Documentation/config/mergetool.txt\n@@ -22,7 +22,7 @@ mergetool..trustExitCode::\n \tFor a custom merge command, specify whether the exit code of\n \tthe merge command can be used to determine whether the merge was\n \tsuccessful. If this is not set to true then the merge target file\n-\ttimestamp is checked and the merge assumed to have been successful\n+\ttimestamp is checked and the merge is assumed to have been successful\n \tif the file has been updated, otherwise the user is prompted to\n \tindicate the success of the merge.\n \ndiff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt\nindex 92a9ebe98c6..51b1b5fe7e3 100644\n--- a/Documentation/config/sendemail.txt\n+++ b/Documentation/config/sendemail.txt\n@@ -91,7 +91,7 @@ sendemail.smtpBatchSize::\n \tSee also the `--batch-size` option of linkgit:git-send-email[1].\n \n sendemail.smtpReloginDelay::\n-\tSeconds wait before reconnecting to smtp server.\n+\tSeconds to wait before reconnecting to smtp server.\n \tSee also the `--relogin-delay` option of linkgit:git-send-email[1].\n \n sendemail.forbidSendmailVariables::\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex a30e3ebc51f..240c54639e8 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -43,7 +43,7 @@ $ git checkout -b --track /\n You could omit ``, in which case the command degenerates to\n \"check out the current branch\", which is a glorified no-op with\n rather expensive side-effects to show only the tracking information,\n-if exists, for the current branch.\n+if it exists, for the current branch.\n \n 'git checkout' -b|-B []::\n \ndiff --git a/Documentation/git-credential-cache.txt b/Documentation/git-credential-cache.txt\nindex f473994a864..487cc557a87 100644\n--- a/Documentation/git-credential-cache.txt\n+++ b/Documentation/git-credential-cache.txt\n@@ -16,7 +16,7 @@ DESCRIPTION\n \n This command caches credentials for use by future Git programs.\n The stored credentials are kept in memory of the cache-daemon\n-process (instead of written to a file) and are forgotten after a\n+process (instead of being written to a file) and are forgotten after a\n configurable timeout. Credentials are forgotten sooner if the\n cache-daemon dies, for example if the system restarts. The cache\n is accessible over a Unix domain socket, restricted to the current\ndiff --git a/Documentation/git-credential-store.txt b/Documentation/git-credential-store.txt\nindex 76b07988563..71864a87264 100644\n--- a/Documentation/git-credential-store.txt\n+++ b/Documentation/git-credential-store.txt\n@@ -33,7 +33,7 @@ OPTIONS\n \n \tUse `` to lookup and store credentials. The file will have its\n \tfilesystem permissions set to prevent other users on the system\n-\tfrom reading it, but will not be encrypted or otherwise\n+\tfrom reading it, but it will not be encrypted or otherwise\n \tprotected. If not specified, credentials will be searched for from\n \t`~/.git-credentials` and `$XDG_CONFIG_HOME/git/credentials`, and\n \tcredentials will be written to `~/.git-credentials` if it exists, or\ndiff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\nindex ac0ac6fa022..179e5ae2162 100644\n--- a/Documentation/git-difftool.txt\n+++ b/Documentation/git-difftool.txt\n@@ -78,7 +78,7 @@ with custom merge tool commands and has the same value as `$MERGED`.\n \tPrint a list of diff tools that may be used with `--tool`.\n \n --[no-]symlinks::\n-\t'git difftool''s default behavior is create symlinks to the\n+\t'git difftool''s default behavior is to create symlinks to the\n \tworking tree when run in `--dir-diff` mode and the right-hand\n \tside of the comparison yields the same content as the file in\n \tthe working tree.\ndiff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt\nindex 46747d5f429..b3467664d30 100644\n--- a/Documentation/git-fetch-pack.txt\n+++ b/Documentation/git-fetch-pack.txt\n@@ -69,7 +69,7 @@ be in a separate packet, and the list must end with a flush packet.\n \n --upload-pack=::\n \tUse this to specify the path to 'git-upload-pack' on the\n-\tremote side, if is not found on your $PATH.\n+\tremote side, if it is not found on your $PATH.\n \tInstallations of sshd ignores the user's environment\n \tsetup scripts for login shells (e.g. .bash_profile) and\n \tyour privately installed git may not be found on the system\ndiff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt\nindex cd8fe9169e8..7a014962343 100644\n--- a/Documentation/git-mktag.txt\n+++ b/Documentation/git-mktag.txt\n@@ -27,7 +27,7 @@ write a tag found in `my-tag`:\n The difference is that mktag will die before writing the tag if the\n tag doesn't pass a linkgit:git-fsck[1] check.\n \n-The \"fsck\" check done mktag is stricter than what linkgit:git-fsck[1]\n+The \"fsck\" check done by mktag is stricter than what linkgit:git-fsck[1]\n would run by default in that all `fsck.` messages are promoted\n from warnings to errors (so e.g. a missing \"tagger\" line is an error).\n \ndiff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt\nindex 844d6f808a0..db742dcfeea 100644\n--- a/Documentation/git-prune-packed.txt\n+++ b/Documentation/git-prune-packed.txt\n@@ -15,7 +15,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n This program searches the `$GIT_OBJECT_DIRECTORY` for all objects that currently\n-exist in a pack file as well as the independent object directories.\n+exist in a pack file as well as in the independent object directories.\n \n All such extra objects are removed.\n \ndiff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt\nindex ad546a37cff..975825b44aa 100644\n--- a/Documentation/git-restore.txt\n+++ b/Documentation/git-restore.txt\n@@ -199,7 +199,7 @@ the same as using linkgit:git-reset[1])\n $ git restore --staged hello.c\n ------------\n \n-or you can restore both the index and the working tree (this the same\n+or you can restore both the index and the working tree (this is the same\n as using linkgit:git-checkout[1])\n \n ------------\ndiff --git a/Documentation/gitprotocol-v2.txt b/Documentation/gitprotocol-v2.txt\nindex acb97ad0c22..8c1e7c61eac 100644\n--- a/Documentation/gitprotocol-v2.txt\n+++ b/Documentation/gitprotocol-v2.txt\n@@ -29,7 +29,7 @@ protocol. Protocol v2 will improve upon v1 in the following ways:\n semantics the http remote helper can simply act as a proxy\n \n In protocol v2 communication is command oriented. When first contacting a\n-server a list of capabilities will advertised. Some of these capabilities\n+server a list of capabilities will be advertised. Some of these capabilities\n will be commands which a client can request be executed. Once a command\n has completed, a client can reuse the connection and request that other\n commands be executed.\ndiff --git a/Documentation/howto/use-git-daemon.txt b/Documentation/howto/use-git-daemon.txt\nindex 7af2e52cf31..2cad9b3ca53 100644\n--- a/Documentation/howto/use-git-daemon.txt\n+++ b/Documentation/howto/use-git-daemon.txt\n@@ -4,7 +4,7 @@ How to use git-daemon\n =====================\n \n Git can be run in inetd mode and in stand alone mode. But all you want is\n-let a coworker pull from you, and therefore need to set up a Git server\n+to let a coworker pull from you, and therefore need to set up a Git server\n real quick, right?\n \n Note that git-daemon is not really chatty at the moment, especially when\ndiff --git a/Documentation/technical/api-simple-ipc.txt b/Documentation/technical/api-simple-ipc.txt\nindex 6c127b5dddf..d88b1ef206e 100644\n--- a/Documentation/technical/api-simple-ipc.txt\n+++ b/Documentation/technical/api-simple-ipc.txt\n@@ -20,7 +20,7 @@ IPC-client.\n \n The IPC-client routines within a client application process connect\n to the IPC-server and send a request message and wait for a response.\n-When received, the response is returned back the caller.\n+When received, the response is returned back to the caller.\n \n For example, the `fsmonitor--daemon` feature will be built as a server\n application on top of the IPC-server library routines. It will have\ndiff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt\nindex b01cff6912a..1719c723f5c 100644\n--- a/Documentation/technical/partial-clone.txt\n+++ b/Documentation/technical/partial-clone.txt\n@@ -3,7 +3,7 @@ Partial Clone Design Notes\n \n The \"Partial Clone\" feature is a performance optimization for Git that\n allows Git to function without having a complete copy of the repository.\n-The goal of this work is to allow Git better handle extremely large\n+The goal of this work is to allow Git to better handle extremely large\n repositories.\n \n During clone and fetch operations, Git downloads the complete contents\ndiff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt\nindex 783e87e6aa4..02ae508d227 100644\n--- a/Documentation/technical/racy-git.txt\n+++ b/Documentation/technical/racy-git.txt\n@@ -11,7 +11,7 @@ write out the next tree object to be committed. The state is\n \"virtual\" in the sense that it does not necessarily have to, and\n often does not, match the files in the working tree.\n \n-There are cases Git needs to examine the differences between the\n+There are cases where Git needs to examine the differences between the\n virtual working tree state in the index and the files in the\n working tree. The most obvious case is when the user asks `git\n diff` (or its low level implementation, `git diff-files`) or\ndiff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt\nindex 3f9259cb1e4..5f4dd7c1028 100644\n--- a/Documentation/technical/rerere.txt\n+++ b/Documentation/technical/rerere.txt\n@@ -60,7 +60,7 @@ By resolving this conflict, to leave line D, the user declares:\n what AB and AC wanted to do.\n \n As branch AC2 refers to the same commit as AC, the above implies that\n-this is also compatible what AB and AC2 wanted to do.\n+this is also compatible with what AB and AC2 wanted to do.\n \n By extension, this means that rerere should recognize that the above\n conflicts are the same. To do this, the labels on the conflict\n-- \ngitgitgadget\n\n"},{"id":"482797","messageId":"72fea54e2bef4e207376ac6505384fa84dee6d5f.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 06/25] documentation: remove extraneous words","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:08Z","receivedAt":"2023-10-08T06:45:52Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config/branch.txt | 2 +-\n Documentation/config/gpg.txt | 2 +-\n Documentation/config/log.txt | 2 +-\n Documentation/config/sendemail.txt | 2 +-\n Documentation/diff-generate-patch.txt | 2 +-\n Documentation/git-diff-tree.txt | 2 +-\n Documentation/git-fsmonitor--daemon.txt | 2 +-\n Documentation/githooks.txt | 2 +-\n Documentation/gitprotocol-common.txt | 2 +-\n Documentation/gitprotocol-http.txt | 2 +-\n Documentation/pull-fetch-param.txt | 2 +-\n Documentation/technical/parallel-checkout.txt | 2 +-\n Documentation/technical/partial-clone.txt | 2 +-\n Documentation/technical/rerere.txt | 2 +-\n Documentation/urls-remotes.txt | 2 +-\n 15 files changed, 15 insertions(+), 15 deletions(-)\n\ndiff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt\nindex 2b05ed3574b..3bec6daf71a 100644\n--- a/Documentation/config/branch.txt\n+++ b/Documentation/config/branch.txt\n@@ -64,7 +64,7 @@ branch..merge::\n \thandled like the remote part of a refspec, and must match a\n \tref which is fetched from the remote given by\n \t\"branch..remote\".\n-\tThe merge information is used by 'git pull' (which at first calls\n+\tThe merge information is used by 'git pull' (which first calls\n \t'git fetch') to lookup the default branch for merging. Without\n \tthis option, 'git pull' defaults to merge the first refspec fetched.\n \tSpecify multiple values to get an octopus merge.\ndiff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt\nindex a31faab2edd..248d99d70b8 100644\n--- a/Documentation/config/gpg.txt\n+++ b/Documentation/config/gpg.txt\n@@ -38,7 +38,7 @@ gpg.minTrustLevel::\n * `ultimate`\n \n gpg.ssh.defaultKeyCommand::\n-\tThis command that will be run when user.signingkey is not set and a ssh\n+\tThis command will be run when user.signingkey is not set and a ssh\n \tsignature is requested. On successful exit a valid ssh public key\n \tprefixed with `key::` is expected in the first line of its output.\n \tThis allows for a script doing a dynamic lookup of the correct public\ndiff --git a/Documentation/config/log.txt b/Documentation/config/log.txt\nindex 5f96cf87fb9..6e04fbe4f48 100644\n--- a/Documentation/config/log.txt\n+++ b/Documentation/config/log.txt\n@@ -9,7 +9,7 @@ log.date::\n \t`--date` option. See linkgit:git-log[1] for details.\n +\n If the format is set to \"auto:foo\" and the pager is in use, format\n-\"foo\" will be the used for the date format. Otherwise \"default\" will\n+\"foo\" will be used for the date format. Otherwise \"default\" will\n be used.\n \n log.decorate::\ndiff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt\nindex 51b1b5fe7e3..792e68a4456 100644\n--- a/Documentation/config/sendemail.txt\n+++ b/Documentation/config/sendemail.txt\n@@ -36,7 +36,7 @@ sendemail.aliasesFile::\n \n sendemail.aliasFileType::\n \tFormat of the file(s) specified in sendemail.aliasesFile. Must be\n-\tone of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus', or 'sendmail'.\n+\tone of 'mutt', 'mailrc', 'pine', 'elm', 'gnus', or 'sendmail'.\n +\n What an alias file in each format looks like can be found in\n the documentation of the email program of the same name. The\ndiff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt\nindex 55df903abd1..49ad31fca2a 100644\n--- a/Documentation/diff-generate-patch.txt\n+++ b/Documentation/diff-generate-patch.txt\n@@ -77,7 +77,7 @@ separate lines indicate the old and the new mode.\n \n 5. Hunk headers mention the name of the function to which the hunk\n applies. See \"Defining a custom hunk-header\" in\n- linkgit:gitattributes[5] for details of how to tailor to this to\n+ linkgit:gitattributes[5] for details of how to tailor this to\n specific languages.\n \n \ndiff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt\nindex 81caad5c95c..37ca32c396f 100644\n--- a/Documentation/git-diff-tree.txt\n+++ b/Documentation/git-diff-tree.txt\n@@ -104,7 +104,7 @@ include::pretty-options.txt[]\n \tThis flag changes the way a merge commit patch is displayed,\n \tin a similar way to the `-c` option. It implies the `-c`\n \tand `-p` options and further compresses the patch output\n-\tby omitting uninteresting hunks whose the contents in the parents\n+\tby omitting uninteresting hunks whose contents in the parents\n \thave only two variants and the merge result picks one of them\n \twithout modification. When all hunks are uninteresting, the commit\n \titself and the commit log message is not shown, just like in any other\ndiff --git a/Documentation/git-fsmonitor--daemon.txt b/Documentation/git-fsmonitor--daemon.txt\nindex 8238eadb0e1..f50a28b09f9 100644\n--- a/Documentation/git-fsmonitor--daemon.txt\n+++ b/Documentation/git-fsmonitor--daemon.txt\n@@ -84,7 +84,7 @@ may or may not have the needed support; the fsmonitor daemon is not guaranteed\n to work with these filesystems and such use is considered experimental.\n \n By default, the socket is created in the `.git` directory, however, if the\n-`.git` directory is on a network-mounted filesystem, it will be instead be\n+`.git` directory is on a network-mounted filesystem, it will instead be\n created at `$HOME/.git-fsmonitor-*` unless `$HOME` itself is on a\n network-mounted filesystem in which case you must set the configuration\n variable `fsmonitor.socketDir` to the path of a directory on a Mac OS native\ndiff --git a/Documentation/githooks.txt b/Documentation/githooks.txt\nindex 63eb030b34d..34e2c656de3 100644\n--- a/Documentation/githooks.txt\n+++ b/Documentation/githooks.txt\n@@ -384,7 +384,7 @@ following example for the protocol, the letter 'S' stands for\n H: PKT-LINE(ok )\n # NO, I reject it.\n H: PKT-LINE(ng )\n- # Fall through, let 'receive-pack' to execute it.\n+ # Fall through, let 'receive-pack' execute it.\n H: PKT-LINE(ok )\n H: PKT-LINE(option fall-through)\n # OK, but has an alternate reference. The alternate reference name\ndiff --git a/Documentation/gitprotocol-common.txt b/Documentation/gitprotocol-common.txt\nindex 1486651bd10..cdc9d6e7075 100644\n--- a/Documentation/gitprotocol-common.txt\n+++ b/Documentation/gitprotocol-common.txt\n@@ -13,7 +13,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n \n-This document sets defines things common to various over-the-wire\n+This document defines things common to various over-the-wire\n protocols and file formats used in Git.\n \n ABNF Notation\ndiff --git a/Documentation/gitprotocol-http.txt b/Documentation/gitprotocol-http.txt\nindex fcc2b25ee9f..21b73b7a1f5 100644\n--- a/Documentation/gitprotocol-http.txt\n+++ b/Documentation/gitprotocol-http.txt\n@@ -42,7 +42,7 @@ both the \"smart\" and \"dumb\" HTTP protocols used by Git operate\n by appending additional path components onto the end of the user\n supplied `$GIT_URL` string.\n \n-An example of a dumb client requesting for a loose object:\n+An example of a dumb client requesting a loose object:\n \n $GIT_URL: http://example.com:8080/git/repo.git\n URL request: http://example.com:8080/git/repo.git/objects/d0/49f6c27a2244e12041955e262a404c7faba355\ndiff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt\nindex 26bf06d991b..74143ef0d24 100644\n--- a/Documentation/pull-fetch-param.txt\n+++ b/Documentation/pull-fetch-param.txt\n@@ -80,7 +80,7 @@ configuration which'll amend these rules, and nothing like a\n +\n As with pushing with linkgit:git-push[1], all of the rules described\n above about what's not allowed as an update can be overridden by\n-adding an the optional leading `+` to a refspec (or using `--force`\n+adding an optional leading `+` to a refspec (or using `--force`\n command line option). The only exception to this is that no amount of\n forcing will make the `refs/heads/*` namespace accept a non-commit\n object.\ndiff --git a/Documentation/technical/parallel-checkout.txt b/Documentation/technical/parallel-checkout.txt\nindex 1a5fe09b51d..b5f54dcd451 100644\n--- a/Documentation/technical/parallel-checkout.txt\n+++ b/Documentation/technical/parallel-checkout.txt\n@@ -63,7 +63,7 @@ improvements over the sequential code, but there was still too much lock\n contention. A `perf` profiling indicated that around 20% of the runtime\n during a local Linux clone (on an SSD) was spent in locking functions.\n For this reason this approach was rejected in favor of using multiple\n-child processes, which led to a better performance.\n+child processes, which led to better performance.\n \n Multi-Process Solution\n ----------------------\ndiff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt\nindex 1719c723f5c..29876ca582a 100644\n--- a/Documentation/technical/partial-clone.txt\n+++ b/Documentation/technical/partial-clone.txt\n@@ -322,7 +322,7 @@ Footnotes\n \n [a] expensive-to-modify list of missing objects: Earlier in the design of\n partial clone we discussed the need for a single list of missing objects.\n- This would essentially be a sorted linear list of OIDs that the were\n+ This would essentially be a sorted linear list of OIDs that were\n omitted by the server during a clone or subsequent fetches.\n \n This file would need to be loaded into memory on every object lookup.\ndiff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt\nindex 5f4dd7c1028..580f23360a2 100644\n--- a/Documentation/technical/rerere.txt\n+++ b/Documentation/technical/rerere.txt\n@@ -145,7 +145,7 @@ Nested conflicts\n Nested conflicts are handled very similarly to \"simple\" conflicts.\n Similar to simple conflicts, the conflict is first normalized by\n stripping the labels from conflict markers, stripping the common ancestor\n-version, and the sorting the conflict hunks, both for the outer and the\n+version, and sorting the conflict hunks, both for the outer and the\n inner conflict. This is done recursively, so any number of nested\n conflicts can be handled.\n \ndiff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt\nindex ae8c2db427b..3504afbf2e9 100644\n--- a/Documentation/urls-remotes.txt\n+++ b/Documentation/urls-remotes.txt\n@@ -33,7 +33,7 @@ config file would appear like this:\n ------------\n \n The `` is used for pushes only. It is optional and defaults\n-to ``. Pushing to a remote affects all defined pushurls or to all\n+to ``. Pushing to a remote affects all defined pushurls or all\n defined urls if no pushurls are defined. Fetch, however, will only\n fetch from the first defined url if multiple urls are defined.\n \n-- \ngitgitgadget\n\n"},{"id":"482798","messageId":"6b30cc92f103459c8f40ccb2f8943da4db9d6ef7.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 08/25] documentation: employ consistent verb tense for a list","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:10Z","receivedAt":"2023-10-08T06:45:54Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config/push.txt | 2 +-\n Documentation/config/receive.txt | 2 +-\n Documentation/git-rev-parse.txt | 2 +-\n 3 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/config/push.txt b/Documentation/config/push.txt\nindex 43338b65e84..dbaf930f01b 100644\n--- a/Documentation/config/push.txt\n+++ b/Documentation/config/push.txt\n@@ -35,7 +35,7 @@ push.default::\n \n * `tracking` - This is a deprecated synonym for `upstream`.\n \n-* `simple` - pushes the current branch with the same name on the remote.\n+* `simple` - push the current branch with the same name on the remote.\n +\n If you are working on a centralized workflow (pushing to the same repository you\n pull from, which is typically `origin`), then you need to configure an upstream\ndiff --git a/Documentation/config/receive.txt b/Documentation/config/receive.txt\nindex ae526cbf584..c77e55b1cdd 100644\n--- a/Documentation/config/receive.txt\n+++ b/Documentation/config/receive.txt\n@@ -14,7 +14,7 @@ receive.autogc::\n \n receive.certNonceSeed::\n \tBy setting this variable to a string, `git receive-pack`\n-\twill accept a `git push --signed` and verifies it by using\n+\twill accept a `git push --signed` and verify it by using\n \ta \"nonce\" protected by HMAC using this string as a secret\n \tkey.\n \ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex 2294e9a519a..7b3ce3012e3 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -156,7 +156,7 @@ for another option.\n \tare not refs (i.e. branch or tag names; or more\n \texplicitly disambiguating \"heads/master\" form, when you\n \twant to name the \"master\" branch when there is an\n-\tunfortunately named tag \"master\"), and show them as full\n+\tunfortunately named tag \"master\"), and shows them as full\n \trefnames (e.g. \"refs/heads/master\").\n \n Options for Objects\n-- \ngitgitgadget\n\n"},{"id":"482799","messageId":"b218a1e66d009d66f83bd605102aee79883fa7e1.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 10/25] documentation: fix adjective vs. noun","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:12Z","receivedAt":"2023-10-08T06:45:56Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config/commit.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/config/commit.txt b/Documentation/config/commit.txt\nindex 2c95573930b..bcb46cf630e 100644\n--- a/Documentation/config/commit.txt\n+++ b/Documentation/config/commit.txt\n@@ -25,5 +25,5 @@ commit.template::\n \tnew commit messages.\n \n commit.verbose::\n-\tA boolean or int to specify the level of verbose with `git commit`.\n+\tA boolean or int to specify the level of verbosity with `git commit`.\n \tSee linkgit:git-commit[1].\n-- \ngitgitgadget\n\n"},{"id":"482800","messageId":"2411c4eae232896a6bccfb9575ea128f12409477.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 09/25] documentation: fix verb tense","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:11Z","receivedAt":"2023-10-08T06:45:59Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config/advice.txt | 2 +-\n Documentation/config/clone.txt | 2 +-\n Documentation/config/column.txt | 2 +-\n Documentation/git-clean.txt | 2 +-\n Documentation/git-help.txt | 6 +++---\n Documentation/git-whatchanged.txt | 2 +-\n Documentation/gitcli.txt | 4 ++--\n Documentation/gitformat-chunk.txt | 2 +-\n Documentation/gitformat-pack.txt | 6 +++---\n Documentation/gitsubmodules.txt | 4 ++--\n Documentation/gitweb.conf.txt | 2 +-\n Documentation/gitweb.txt | 4 ++--\n Documentation/technical/reftable.txt | 2 +-\n 13 files changed, 20 insertions(+), 20 deletions(-)\n\ndiff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt\nindex f524af4e899..c8e38a0e5cd 100644\n--- a/Documentation/config/advice.txt\n+++ b/Documentation/config/advice.txt\n@@ -87,7 +87,7 @@ advice.*::\n \tdetachedHead::\n \t\tAdvice shown when you used\n \t\tlinkgit:git-switch[1] or linkgit:git-checkout[1]\n-\t\tto move to the detach HEAD state, to instruct how to\n+\t\tto move to the detached HEAD state, to instruct how to\n \t\tcreate a local branch after the fact.\n \tsuggestDetachingHead::\n \t\tAdvice shown when linkgit:git-switch[1] refuses to detach HEAD\ndiff --git a/Documentation/config/clone.txt b/Documentation/config/clone.txt\nindex a16b1b6fa34..d037b57f729 100644\n--- a/Documentation/config/clone.txt\n+++ b/Documentation/config/clone.txt\n@@ -4,7 +4,7 @@ clone.defaultRemoteName::\n \toption to linkgit:git-clone[1].\n \n clone.rejectShallow::\n-\tReject to clone a repository if it is a shallow one; this can be overridden by\n+\tReject cloning a repository if it is a shallow one; this can be overridden by\n \tpassing the `--reject-shallow` option on the command line. See linkgit:git-clone[1]\n \n clone.filterSubmodules::\ndiff --git a/Documentation/config/column.txt b/Documentation/config/column.txt\nindex 76aa2f29dc2..9f30322362d 100644\n--- a/Documentation/config/column.txt\n+++ b/Documentation/config/column.txt\n@@ -43,7 +43,7 @@ column.branch::\n \tSee `column.ui` for details.\n \n column.clean::\n-\tSpecify the layout when list items in `git clean -i`, which always\n+\tSpecify the layout when listing items in `git clean -i`, which always\n \tshows files and directories in columns. See `column.ui` for details.\n \n column.status::\ndiff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt\nindex 5e1a3d5148c..69331e3f05a 100644\n--- a/Documentation/git-clean.txt\n+++ b/Documentation/git-clean.txt\n@@ -103,7 +103,7 @@ filter by pattern::\n This shows the files and directories to be deleted and issues an\n \"Input ignore patterns>>\" prompt. You can input space-separated\n patterns to exclude files and directories from deletion.\n- E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from\n+ E.g. \"*.c *.h\" will exclude files ending with \".c\" and \".h\" from\n deletion. When you are satisfied with the filtered result, press\n ENTER (empty) back to the main menu.\n \ndiff --git a/Documentation/git-help.txt b/Documentation/git-help.txt\nindex 7cb4b4bda18..ee18a2b7432 100644\n--- a/Documentation/git-help.txt\n+++ b/Documentation/git-help.txt\n@@ -48,7 +48,7 @@ OPTIONS\n -------\n -a::\n --all::\n-\tPrints all the available commands on the standard output.\n+\tPrint all the available commands on the standard output.\n \n --no-external-commands::\n \tWhen used with `--all`, exclude the listing of external \"git-*\"\n@@ -69,10 +69,10 @@ OPTIONS\n \n -g::\n --guides::\n-\tPrints a list of the Git concept guides on the standard output.\n+\tPrint a list of the Git concept guides on the standard output.\n \n --user-interfaces::\n-\tPrints a list of the repository, command and file interfaces\n+\tPrint a list of the repository, command and file interfaces\n \tdocumentation on the standard output.\n +\n In-repository file interfaces such as `.git/info/exclude` are\ndiff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt\nindex 5cbb31f33e3..ee8c1aa0ca4 100644\n--- a/Documentation/git-whatchanged.txt\n+++ b/Documentation/git-whatchanged.txt\n@@ -18,7 +18,7 @@ Shows commit logs and diff output each commit introduces.\n \n New users are encouraged to use linkgit:git-log[1] instead. The\n `whatchanged` command is essentially the same as linkgit:git-log[1]\n-but defaults to show the raw format diff output and to skip merges.\n+but defaults to showing the raw format diff output and skipping merges.\n \n The command is primarily kept for historical reasons; fingers of\n many people who learned Git long before `git log` was invented by\ndiff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt\nindex 1819a5a1859..f0986881bac 100644\n--- a/Documentation/gitcli.txt\n+++ b/Documentation/gitcli.txt\n@@ -23,7 +23,7 @@ arguments. Here are the rules:\n A subcommand may take dashed options (which may take their own\n arguments, e.g. \"--max-parents 2\") and arguments. You SHOULD\n give dashed options first and then arguments. Some commands may\n- accept dashed options after you have already gave non-option\n+ accept dashed options after you have already given non-option\n arguments (which may make the command ambiguous), but you should\n not rely on it (because eventually we may find a way to fix\n these ambiguity by enforcing the \"options then args\" rule).\n@@ -42,7 +42,7 @@ arguments. Here are the rules:\n `git diff HEAD --` to ask for the latter.\n \n * Without disambiguating `--`, Git makes a reasonable guess, but errors\n- out and asking you to disambiguate when ambiguous. E.g. if you have a\n+ out and asks you to disambiguate when ambiguous. E.g. if you have a\n file called HEAD in your work tree, `git diff HEAD` is ambiguous, and\n you have to say either `git diff HEAD --` or `git diff -- HEAD` to\n disambiguate.\ndiff --git a/Documentation/gitformat-chunk.txt b/Documentation/gitformat-chunk.txt\nindex 76ea678398a..3315df6201d 100644\n--- a/Documentation/gitformat-chunk.txt\n+++ b/Documentation/gitformat-chunk.txt\n@@ -67,7 +67,7 @@ caller is responsible for opening the `hashfile` and writing header\n information so the file format is identifiable before the chunk-based\n format begins.\n \n-Then, call `add_chunk()` for each chunk that is intended for write. This\n+Then, call `add_chunk()` for each chunk that is intended for writing. This\n populates the `chunkfile` with information about the order and size of\n each chunk to write. Provide a `chunk_write_fn` function pointer to\n perform the write of the chunk data upon request.\ndiff --git a/Documentation/gitformat-pack.txt b/Documentation/gitformat-pack.txt\nindex 42afb953e8c..f5d07a125d9 100644\n--- a/Documentation/gitformat-pack.txt\n+++ b/Documentation/gitformat-pack.txt\n@@ -117,7 +117,7 @@ the delta data is a sequence of instructions to reconstruct the object\n from the base object. If the base object is deltified, it must be\n converted to canonical form first. Each instruction appends more and\n more data to the target object until it's complete. There are two\n-supported instructions so far: one for copy a byte range from the\n+supported instructions so far: one for copying a byte range from the\n source object and one for inserting new data embedded in the\n instruction itself.\n \n@@ -137,7 +137,7 @@ copy. Offset and size are in little-endian order.\n \n All offset and size bytes are optional. This is to reduce the\n instruction size when encoding small offsets or sizes. The first seven\n-bits in the first octet determines which of the next seven octets is\n+bits in the first octet determine which of the next seven octets is\n present. If bit zero is set, offset1 is present. If bit one is set\n offset2 is present and so on.\n \n@@ -163,7 +163,7 @@ converted to 0x10000.\n \n This is the instruction to construct target object without the base\n object. The following data is appended to the target object. The first\n-seven bits of the first octet determines the size of data in\n+seven bits of the first octet determine the size of data in\n bytes. The size must be non-zero.\n \n ==== Reserved instruction\ndiff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt\nindex 941858a6ecc..13678ead045 100644\n--- a/Documentation/gitsubmodules.txt\n+++ b/Documentation/gitsubmodules.txt\n@@ -78,7 +78,7 @@ Submodule operations can be configured using the following mechanisms\n \n * The command line for those commands that support taking submodules\n as part of their pathspecs. Most commands have a boolean flag\n- `--recurse-submodules` which specify whether to recurse into submodules.\n+ `--recurse-submodules` which specifies whether to recurse into submodules.\n Examples are `grep` and `checkout`.\n Some commands take enums, such as `fetch` and `push`, where you can\n specify how submodules are affected.\n@@ -274,7 +274,7 @@ will not be checked out by default; you can instruct `clone` to recurse\n into submodules. The `init` and `update` subcommands of `git submodule`\n will maintain submodules checked out and at an appropriate revision in\n your working tree. Alternatively you can set `submodule.recurse` to have\n-`checkout` recursing into submodules (note that `submodule.recurse` also\n+`checkout` recurse into submodules (note that `submodule.recurse` also\n affects other Git commands, see linkgit:git-config[1] for a complete list).\n \n \ndiff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt\nindex 34b1d6e2243..b078fef6f5c 100644\n--- a/Documentation/gitweb.conf.txt\n+++ b/Documentation/gitweb.conf.txt\n@@ -53,7 +53,7 @@ following order:\n `/etc/gitweb-common.conf`),\n \n * either per-instance configuration file (defaults to 'gitweb_config.perl'\n- in the same directory as the installed gitweb), or if it does not exists\n+ in the same directory as the installed gitweb), or if it does not exist\n then fallback system-wide configuration file (defaults to `/etc/gitweb.conf`).\n \n Values obtained in later configuration files override values obtained earlier\ndiff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt\nindex bb9cbad7f3f..41ce55e266a 100644\n--- a/Documentation/gitweb.txt\n+++ b/Documentation/gitweb.txt\n@@ -8,7 +8,7 @@ gitweb - Git web interface (web frontend to Git repositories)\n SYNOPSIS\n --------\n To get started with gitweb, run linkgit:git-instaweb[1] from a Git repository.\n-This would configure and start your web server, and run web browser pointing to\n+This will configure and start your web server, and run a web browser pointing to\n gitweb.\n \n \n@@ -24,7 +24,7 @@ Gitweb provides a web interface to Git repositories. Its features include:\n * Viewing the blame/annotation details of any file (if enabled).\n * Generating RSS and Atom feeds of commits, for any branch.\n The feeds are auto-discoverable in modern web browsers.\n-* Viewing everything that was changed in a revision, and step through\n+* Viewing everything that was changed in a revision, and stepping through\n revisions one at a time, viewing the history of the repository.\n * Finding commits whose commit messages match a given search term.\n \ndiff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.txt\nindex 84637f96e77..6def498efd5 100644\n--- a/Documentation/technical/reftable.txt\n+++ b/Documentation/technical/reftable.txt\n@@ -247,7 +247,7 @@ uint32( hash_id )\n ....\n \n The header is identical to `version_number=1`, with the 4-byte hash ID\n-(\"sha1\" for SHA1 and \"s256\" for SHA-256) append to the header.\n+(\"sha1\" for SHA1 and \"s256\" for SHA-256) appended to the header.\n \n For maximum backward compatibility, it is recommended to use version 1 when\n writing SHA1 reftables.\n-- \ngitgitgadget\n\n"},{"id":"482801","messageId":"4ff24f3cb24605a892d84baf98a327f55b5817fa.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 11/25] documentation: fix verb vs. noun","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:13Z","receivedAt":"2023-10-08T06:46:02Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config/imap.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/config/imap.txt b/Documentation/config/imap.txt\nindex fa0dccc3d83..3d28f726437 100644\n--- a/Documentation/config/imap.txt\n+++ b/Documentation/config/imap.txt\n@@ -4,7 +4,7 @@ imap.folder::\n \t\"[Gmail]/Drafts\". Required.\n \n imap.tunnel::\n-\tCommand used to setup a tunnel to the IMAP server through which\n+\tCommand used to set up a tunnel to the IMAP server through which\n \tcommands will be piped instead of using a direct network connection\n \tto the server. Required when imap.host is not set.\n \n-- \ngitgitgadget\n\n"},{"id":"482802","messageId":"36861d13e4ea36c34b3aa57b30092004f63f02f5.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 07/25] documentation: fix subject/verb agreement","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:09Z","receivedAt":"2023-10-08T06:46:03Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/CodingGuidelines | 2 +-\n Documentation/config/advice.txt | 2 +-\n Documentation/config/alias.txt | 2 +-\n Documentation/config/fsck.txt | 2 +-\n Documentation/config/gpg.txt | 2 +-\n Documentation/config/maintenance.txt | 2 +-\n Documentation/config/status.txt | 2 +-\n Documentation/fetch-options.txt | 2 +-\n Documentation/git-blame.txt | 2 +-\n Documentation/git-diff-tree.txt | 2 +-\n Documentation/git-format-patch.txt | 2 +-\n Documentation/git-fsck.txt | 4 ++--\n Documentation/git-init.txt | 2 +-\n Documentation/git-rev-list.txt | 2 +-\n Documentation/git-show-ref.txt | 2 +-\n Documentation/git-symbolic-ref.txt | 2 +-\n Documentation/gitdiffcore.txt | 2 +-\n Documentation/gitformat-bundle.txt | 2 +-\n Documentation/gitprotocol-capabilities.txt | 2 +-\n Documentation/gitprotocol-pack.txt | 4 ++--\n Documentation/glossary-content.txt | 2 +-\n Documentation/howto/coordinate-embargoed-releases.txt | 2 +-\n Documentation/i18n.txt | 2 +-\n Documentation/technical/api-simple-ipc.txt | 2 +-\n Documentation/technical/reftable.txt | 4 ++--\n 25 files changed, 28 insertions(+), 28 deletions(-)\n\ndiff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines\nindex 99b22ff2345..c494e07460e 100644\n--- a/Documentation/CodingGuidelines\n+++ b/Documentation/CodingGuidelines\n@@ -40,7 +40,7 @@ As for more concrete guidelines, just imitate the existing code\n contributing to). It is always preferable to match the _local_\n convention. New code added to Git suite is expected to match\n the overall style of existing code. Modifications to existing\n-code is expected to match the style the surrounding code already\n+code are expected to match the style the surrounding code already\n uses (even if it doesn't match the overall style of existing code).\n \n But if you must have a list of rules, here are some language\ndiff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt\nindex f4864a2d58b..f524af4e899 100644\n--- a/Documentation/config/advice.txt\n+++ b/Documentation/config/advice.txt\n@@ -5,7 +5,7 @@ advice.*::\n +\n --\n \tambiguousFetchRefspec::\n-\t\tAdvice shown when fetch refspec for multiple remotes map to\n+\t\tAdvice shown when fetch refspec for multiple remotes maps to\n \t\tthe same remote-tracking branch namespace and causes branch\n \t\ttracking set-up to fail.\n \tfetchShowForcedUpdates::\ndiff --git a/Documentation/config/alias.txt b/Documentation/config/alias.txt\nindex f1ca739d574..01df96fab3d 100644\n--- a/Documentation/config/alias.txt\n+++ b/Documentation/config/alias.txt\n@@ -4,7 +4,7 @@ alias.*::\n \t`git last` is equivalent to `git cat-file commit HEAD`. To avoid\n \tconfusion and troubles with script usage, aliases that\n \thide existing Git commands are ignored. Arguments are split by\n-\tspaces, the usual shell quoting and escaping is supported.\n+\tspaces, the usual shell quoting and escaping are supported.\n \tA quote pair or a backslash can be used to quote them.\n +\n Note that the first word of an alias does not necessarily have to be a\ndiff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt\nindex 9b167575530..0687e86ba10 100644\n--- a/Documentation/config/fsck.txt\n+++ b/Documentation/config/fsck.txt\n@@ -44,7 +44,7 @@ fsck.skipList::\n \tThe path to a list of object names (i.e. one unabbreviated SHA-1 per\n \tline) that are known to be broken in a non-fatal way and should\n \tbe ignored. On versions of Git 2.20 and later comments ('#'), empty\n-\tlines, and any leading and trailing whitespace is ignored. Everything\n+\tlines, and any leading and trailing whitespace are ignored. Everything\n \tbut a SHA-1 per line will error out on older versions.\n +\n This feature is useful when an established project should be accepted\ndiff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt\nindex 248d99d70b8..5cf32b179dc 100644\n--- a/Documentation/config/gpg.txt\n+++ b/Documentation/config/gpg.txt\n@@ -25,7 +25,7 @@ gpg..program::\n gpg.minTrustLevel::\n \tSpecifies a minimum trust level for signature verification. If\n \tthis option is unset, then signature verification for merge\n-\toperations require a key with at least `marginal` trust. Other\n+\toperations requires a key with at least `marginal` trust. Other\n \toperations that perform signature verification require a key\n \twith at least `undefined` trust. Setting this option overrides\n \tthe required trust-level for all operations. Supported values,\ndiff --git a/Documentation/config/maintenance.txt b/Documentation/config/maintenance.txt\nindex 18f05621314..69a4f05153e 100644\n--- a/Documentation/config/maintenance.txt\n+++ b/Documentation/config/maintenance.txt\n@@ -12,7 +12,7 @@ maintenance.strategy::\n \tthen that value is used instead of the one provided by\n \t`maintenance.strategy`. The possible strategy strings are:\n +\n-* `none`: This default setting implies no task are run at any schedule.\n+* `none`: This default setting implies no tasks are run at any schedule.\n * `incremental`: This setting optimizes for performing small maintenance\n activities that do not delete any data. This does not schedule the `gc`\n task, but runs the `prefetch` and `commit-graph` tasks hourly, the\ndiff --git a/Documentation/config/status.txt b/Documentation/config/status.txt\nindex 0fc704ab80b..f0336938cbc 100644\n--- a/Documentation/config/status.txt\n+++ b/Documentation/config/status.txt\n@@ -47,7 +47,7 @@ status.showUntrackedFiles::\n \tcontain only untracked files, are shown with the directory name\n \tonly. Showing untracked files means that Git needs to lstat() all\n \tthe files in the whole repository, which might be slow on some\n-\tsystems. So, this variable controls how the commands displays\n+\tsystems. So, this variable controls how the commands display\n \tthe untracked files. Possible values are:\n +\n --\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex 41fc7ca3c67..9ee9fa659d2 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -43,7 +43,7 @@ the current repository has the same history as the source repository.\n --update-shallow::\n \tBy default when fetching from a shallow repository,\n \t`git fetch` refuses refs that require updating\n-\t.git/shallow. This option updates .git/shallow and accept such\n+\t.git/shallow. This option updates .git/shallow and accepts such\n \trefs.\n \n --negotiation-tip=::\ndiff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt\nindex f69a871a96f..a927c7c9f33 100644\n--- a/Documentation/git-blame.txt\n+++ b/Documentation/git-blame.txt\n@@ -128,7 +128,7 @@ at least once for each commit:\n - the filename in the commit that the line is attributed to.\n - the first line of the commit log message (\"summary\").\n \n-The contents of the actual line is output after the above\n+The contents of the actual line are output after the above\n header, prefixed by a TAB. This is to allow adding more\n header elements later.\n \ndiff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt\nindex 37ca32c396f..1e34f80daa9 100644\n--- a/Documentation/git-diff-tree.txt\n+++ b/Documentation/git-diff-tree.txt\n@@ -107,7 +107,7 @@ include::pretty-options.txt[]\n \tby omitting uninteresting hunks whose contents in the parents\n \thave only two variants and the merge result picks one of them\n \twithout modification. When all hunks are uninteresting, the commit\n-\titself and the commit log message is not shown, just like in any other\n+\titself and the commit log message are not shown, just like in any other\n \t\"empty diff\" case.\n \n --combined-all-paths::\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex 711823a7f4e..aaafce24be2 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -55,7 +55,7 @@ A \"message\" generated by the command consists of three parts:\n * The \"patch\", which is the \"diff -p --stat\" output (see\n linkgit:git-diff[1]) between the commit and its parent.\n \n-The log message and the patch is separated by a line with a\n+The log message and the patch are separated by a line with a\n three-dash line.\n \n There are two ways to specify which commits to operate on.\ndiff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt\nindex b6a0f8a085c..e4980d28615 100644\n--- a/Documentation/git-fsck.txt\n+++ b/Documentation/git-fsck.txt\n@@ -64,7 +64,7 @@ index file, all SHA-1 references in `refs` namespace, and all reflogs\n --connectivity-only::\n \tCheck only the connectivity of reachable objects, making sure\n \tthat any objects referenced by a reachable tag, commit, or tree\n-\tis present. This speeds up the operation by avoiding reading\n+\tare present. This speeds up the operation by avoiding reading\n \tblobs entirely (though it does still check that referenced blobs\n \texist). This will detect corruption in commits and trees, but\n \tnot do any semantic checks (e.g., for format errors). Corruption\n@@ -79,7 +79,7 @@ care about this output and want to speed it up further.\n \trecorded with g+w bit set, which was created by older\n \tversions of Git. Existing repositories, including the\n \tLinux kernel, Git itself, and sparse repository have old\n-\tobjects that triggers this check, but it is recommended\n+\tobjects that trigger this check, but it is recommended\n \tto check new projects with this flag.\n \n --verbose::\ndiff --git a/Documentation/git-init.txt b/Documentation/git-init.txt\nindex 30ab86ab96a..138dc4a3bfe 100644\n--- a/Documentation/git-init.txt\n+++ b/Documentation/git-init.txt\n@@ -115,7 +115,7 @@ Same as 'group', but make the repository readable by all users.\n '' is a 3-digit octal number prefixed with `0` and each file\n will have mode ''. '' will override users' umask(2)\n value (and not only loosen permissions as 'group' and 'all'\n-does). '0640' will create a repository which is group-readable, but\n+do). '0640' will create a repository which is group-readable, but\n not group-writable or accessible to others. '0660' will create a repo\n that is readable and writable to the current user and group, but\n inaccessible to others (directories and executable files get their\ndiff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt\nindex fbe913ee746..2e05c4b5109 100644\n--- a/Documentation/git-rev-list.txt\n+++ b/Documentation/git-rev-list.txt\n@@ -19,7 +19,7 @@ include::rev-list-description.txt[]\n \n 'rev-list' is an essential Git command, since it\n provides the ability to build and traverse commit ancestry graphs. For\n-this reason, it has a lot of different options that enables it to be\n+this reason, it has a lot of different options that enable it to be\n used by commands as different as 'git bisect' and\n 'git repack'.\n \ndiff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt\nindex 2fe274b8faa..36e81b9dec4 100644\n--- a/Documentation/git-show-ref.txt\n+++ b/Documentation/git-show-ref.txt\n@@ -144,7 +144,7 @@ use:\n -----------------------------------------------------------------------------\n \n This will show \"refs/heads/master\" but also \"refs/remote/other-repo/master\",\n-if such references exists.\n+if such references exist.\n \n When using the `--verify` flag, the command requires an exact path:\n \ndiff --git a/Documentation/git-symbolic-ref.txt b/Documentation/git-symbolic-ref.txt\nindex 102c83eb19e..761b154bcbb 100644\n--- a/Documentation/git-symbolic-ref.txt\n+++ b/Documentation/git-symbolic-ref.txt\n@@ -27,7 +27,7 @@ symbolic ref.\n \n A symbolic ref is a regular file that stores a string that\n begins with `ref: refs/`. For example, your `.git/HEAD` is\n-a regular file whose contents is `ref: refs/heads/master`.\n+a regular file whose content is `ref: refs/heads/master`.\n \n OPTIONS\n -------\ndiff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt\nindex 0d57f86abc4..5681ba3f330 100644\n--- a/Documentation/gitdiffcore.txt\n+++ b/Documentation/gitdiffcore.txt\n@@ -173,7 +173,7 @@ Note that when rename detection is on but both copy and break\n detection are off, rename detection adds a preliminary step that first\n checks if files are moved across directories while keeping their\n filename the same. If there is a file added to a directory whose\n-contents is sufficiently similar to a file with the same name that got\n+contents are sufficiently similar to a file with the same name that got\n deleted from a different directory, it will mark them as renames and\n exclude them from the later quadratic step (the one that pairwise\n compares all unmatched files to find the \"best\" matches, determined by\ndiff --git a/Documentation/gitformat-bundle.txt b/Documentation/gitformat-bundle.txt\nindex f1acf196e10..1b75cf71cec 100644\n--- a/Documentation/gitformat-bundle.txt\n+++ b/Documentation/gitformat-bundle.txt\n@@ -67,7 +67,7 @@ A Git bundle consists of several parts.\n * \"Capabilities\", which are only in the v3 format, indicate functionality that\n \tthe bundle requires to be read properly.\n \n-* \"Prerequisites\" lists the objects that are NOT included in the bundle and the\n+* \"Prerequisites\" list the objects that are NOT included in the bundle and the\n reader of the bundle MUST already have, in order to use the data in the\n bundle. The objects stored in the bundle may refer to prerequisite objects and\n anything reachable from them (e.g. a tree object in the bundle can reference\ndiff --git a/Documentation/gitprotocol-capabilities.txt b/Documentation/gitprotocol-capabilities.txt\nindex 9adda577e51..388846d92e9 100644\n--- a/Documentation/gitprotocol-capabilities.txt\n+++ b/Documentation/gitprotocol-capabilities.txt\n@@ -30,7 +30,7 @@ to be in effect. The client MUST NOT ask for capabilities the server\n did not say it supports.\n \n Server MUST diagnose and abort if capabilities it does not understand\n-was sent. Server MUST NOT ignore capabilities that client requested\n+were sent. Server MUST NOT ignore capabilities that client requested\n and server advertised. As a consequence of these rules, server MUST\n NOT advertise capabilities it does not understand.\n \ndiff --git a/Documentation/gitprotocol-pack.txt b/Documentation/gitprotocol-pack.txt\nindex 01391cb300d..837b691c892 100644\n--- a/Documentation/gitprotocol-pack.txt\n+++ b/Documentation/gitprotocol-pack.txt\n@@ -30,7 +30,7 @@ pkt-line Format\n ---------------\n \n The descriptions below build on the pkt-line format described in\n-linkgit:gitprotocol-common[5]. When the grammar indicate `PKT-LINE(...)`, unless\n+linkgit:gitprotocol-common[5]. When the grammar indicates `PKT-LINE(...)`, unless\n otherwise noted the usual pkt-line LF rules apply: the sender SHOULD\n include a LF, but the receiver MUST NOT complain if it is not present.\n \n@@ -325,7 +325,7 @@ a positive depth, this step is skipped.\n \n If the client has requested a positive depth, the server will compute\n the set of commits which are no deeper than the desired depth. The set\n-of commits start at the client's wants.\n+of commits starts at the client's wants.\n \n The server writes 'shallow' lines for each\n commit whose parents will not be sent as a result. The server writes\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex 5a537268e27..65c89e7b3eb 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -186,7 +186,7 @@ current branch integrates with) obviously do not work, as there is no\n \tpoints at the directory that is the real repository.\n \n [[def_grafts]]grafts::\n-\tGrafts enables two otherwise different lines of development to be joined\n+\tGrafts enable two otherwise different lines of development to be joined\n \ttogether by recording fake ancestry information for commits. This way\n \tyou can make Git pretend the set of <> a <> has\n \tis different from what was recorded when the commit was\ndiff --git a/Documentation/howto/coordinate-embargoed-releases.txt b/Documentation/howto/coordinate-embargoed-releases.txt\nindex e653775bab1..b9cb95e82f0 100644\n--- a/Documentation/howto/coordinate-embargoed-releases.txt\n+++ b/Documentation/howto/coordinate-embargoed-releases.txt\n@@ -145,7 +145,7 @@ Opening a Security Advisory draft\n \n The first step is to https://github.com/git/git/security/advisories/new[open\n an advisory]. Technically, this is not necessary. However, it is the most\n-convenient way to obtain the CVE number and it give us a private repository\n+convenient way to obtain the CVE number and it gives us a private repository\n associated with it that can be used to collaborate on a fix.\n \n Notifying the Linux distributions\ndiff --git a/Documentation/i18n.txt b/Documentation/i18n.txt\nindex 0efb1153d27..3a866af4a42 100644\n--- a/Documentation/i18n.txt\n+++ b/Documentation/i18n.txt\n@@ -34,7 +34,7 @@ project find it more convenient to use legacy encodings, Git\n does not forbid it. However, there are a few things to keep in\n mind.\n \n-. 'git commit' and 'git commit-tree' issues\n+. 'git commit' and 'git commit-tree' issue\n a warning if the commit log message given to it does not look\n like a valid UTF-8 string, unless you explicitly say your\n project uses a legacy encoding. The way to say this is to\ndiff --git a/Documentation/technical/api-simple-ipc.txt b/Documentation/technical/api-simple-ipc.txt\nindex d88b1ef206e..b4259098680 100644\n--- a/Documentation/technical/api-simple-ipc.txt\n+++ b/Documentation/technical/api-simple-ipc.txt\n@@ -2,7 +2,7 @@ Simple-IPC API\n ==============\n \n The Simple-IPC API is a collection of `ipc_` prefixed library routines\n-and a basic communication protocol that allow an IPC-client process to\n+and a basic communication protocol that allows an IPC-client process to\n send an application-specific IPC-request message to an IPC-server\n process and receive an application-specific IPC-response message.\n \ndiff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.txt\nindex d7d066d876a..84637f96e77 100644\n--- a/Documentation/technical/reftable.txt\n+++ b/Documentation/technical/reftable.txt\n@@ -46,7 +46,7 @@ search lookup, and range scans.\n \n Storage in the file is organized into variable sized blocks. Prefix\n compression is used within a single block to reduce disk space. Block\n-size and alignment is tunable by the writer.\n+size and alignment are tunable by the writer.\n \n Performance\n ^^^^^^^^^^^\n@@ -288,7 +288,7 @@ The 2-byte `restart_count` stores the number of entries in the\n `restart_count` to binary search between restarts before starting a\n linear scan.\n \n-Exactly `restart_count` 3-byte `restart_offset` values precedes the\n+Exactly `restart_count` 3-byte `restart_offset` values precede the\n `restart_count`. Offsets are relative to the start of the block and\n refer to the first byte of any `ref_record` whose name has not been\n prefix compressed. Entries in the `restart_offset` list must be sorted,\n-- \ngitgitgadget\n\n"},{"id":"482804","messageId":"37dffdf9fbd0a869d9a2814df590c029e887c595.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 01/25] documentation: wording improvements","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:03Z","receivedAt":"2023-10-08T06:46:05Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/CodingGuidelines | 4 ++--\n Documentation/ToolsForGit.txt | 2 +-\n Documentation/config.txt | 4 ++--\n Documentation/config/apply.txt | 2 +-\n Documentation/config/branch.txt | 2 +-\n Documentation/config/clone.txt | 4 ++--\n Documentation/config/credential.txt | 2 +-\n Documentation/config/fetch.txt | 4 ++--\n Documentation/config/fsck.txt | 4 ++--\n Documentation/config/fsmonitor--daemon.txt | 2 +-\n Documentation/config/gc.txt | 2 +-\n Documentation/config/gpg.txt | 2 +-\n Documentation/config/http.txt | 2 +-\n Documentation/config/imap.txt | 2 +-\n Documentation/config/mergetool.txt | 2 +-\n Documentation/config/pack.txt | 6 +++---\n Documentation/config/receive.txt | 2 +-\n Documentation/config/safe.txt | 4 ++--\n Documentation/config/submodule.txt | 2 +-\n Documentation/config/trace2.txt | 2 +-\n Documentation/config/transfer.txt | 4 ++--\n Documentation/config/user.txt | 2 +-\n Documentation/diff-generate-patch.txt | 4 ++--\n Documentation/diff-options.txt | 2 +-\n Documentation/git-apply.txt | 2 +-\n Documentation/git-archive.txt | 16 ++++++++--------\n Documentation/git-bugreport.txt | 9 +++++----\n Documentation/git-checkout-index.txt | 2 +-\n Documentation/git-count-objects.txt | 4 ++--\n Documentation/git-credential.txt | 2 +-\n Documentation/git-diff-index.txt | 4 ++--\n Documentation/git-diff-tree.txt | 2 +-\n Documentation/git-fast-import.txt | 2 +-\n Documentation/git-hash-object.txt | 8 ++++----\n Documentation/git-help.txt | 2 +-\n Documentation/git-http-backend.txt | 10 +++++-----\n Documentation/git-http-fetch.txt | 2 +-\n Documentation/git-http-push.txt | 4 ++--\n Documentation/git-index-pack.txt | 10 +++++-----\n Documentation/git-init.txt | 2 +-\n Documentation/git-ls-files.txt | 6 +++---\n Documentation/git-maintenance.txt | 6 +++---\n Documentation/git-merge.txt | 2 +-\n Documentation/git-mergetool.txt | 2 +-\n Documentation/git-mktree.txt | 4 ++--\n Documentation/git-range-diff.txt | 2 +-\n Documentation/git-read-tree.txt | 2 +-\n Documentation/git-remote-ext.txt | 2 +-\n Documentation/git-repack.txt | 2 +-\n Documentation/git-restore.txt | 2 +-\n Documentation/git-rev-list.txt | 2 +-\n Documentation/git-rev-parse.txt | 2 +-\n Documentation/git-send-email.txt | 4 ++--\n Documentation/git-send-pack.txt | 10 +++++-----\n Documentation/git-status.txt | 2 +-\n Documentation/git-stripspace.txt | 2 +-\n Documentation/git-var.txt | 2 +-\n Documentation/git-whatchanged.txt | 2 +-\n Documentation/gitformat-bundle.txt | 6 +++---\n Documentation/githooks.txt | 2 +-\n Documentation/gitprotocol-capabilities.txt | 14 +++++++-------\n Documentation/gitprotocol-http.txt | 4 ++--\n Documentation/gitweb.txt | 4 ++--\n Documentation/howto/maintain-git.txt | 4 ++--\n Documentation/howto/using-merge-subtree.txt | 2 +-\n Documentation/i18n.txt | 2 +-\n Documentation/mergetools/vimdiff.txt | 4 ++--\n Documentation/technical/api-simple-ipc.txt | 2 +-\n Documentation/technical/bitmap-format.txt | 2 +-\n Documentation/technical/parallel-checkout.txt | 2 +-\n Documentation/technical/partial-clone.txt | 2 +-\n Documentation/technical/racy-git.txt | 6 +++---\n Documentation/technical/reftable.txt | 2 +-\n Documentation/urls.txt | 4 ++--\n 74 files changed, 134 insertions(+), 133 deletions(-)\n\ndiff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines\nindex 65af8d82ced..99b22ff2345 100644\n--- a/Documentation/CodingGuidelines\n+++ b/Documentation/CodingGuidelines\n@@ -1,5 +1,5 @@\n-Like other projects, we also have some guidelines to keep to the\n-code. For Git in general, a few rough rules are:\n+Like other projects, we also have some guidelines for our code. For\n+Git in general, a few rough rules are:\n \n - Most importantly, we never say \"It's in POSIX; we'll happily\n ignore your needs should your system not conform to it.\"\ndiff --git a/Documentation/ToolsForGit.txt b/Documentation/ToolsForGit.txt\nindex 5060d0d2314..5d01e8191aa 100644\n--- a/Documentation/ToolsForGit.txt\n+++ b/Documentation/ToolsForGit.txt\n@@ -32,7 +32,7 @@ information on using the script.\n \n This is adapted from Linux's suggestion in its CodingStyle document:\n \n-- To follow rules of the CodingGuideline, it's useful to put the following in\n+- To follow the rules in CodingGuidelines, it's useful to put the following in\n GIT_CHECKOUT/.dir-locals.el, assuming you use cperl-mode:\n ----\n ;; note the first part is useful for C editing, too\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 229b63a454c..9273c7f1c65 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -11,7 +11,7 @@ file. The file `/etc/gitconfig` can be used to store a system-wide\n default configuration.\n \n The configuration variables are used by both the Git plumbing\n-and the porcelains. The variables are divided into sections, wherein\n+and the porcelain commands. The variables are divided into sections, wherein\n the fully qualified variable name of the variable itself is the last\n dot-separated segment and the section name is everything before the last\n dot. The variable names are case-insensitive, allow only alphanumeric\n@@ -103,7 +103,7 @@ was found. See below for examples.\n Conditional includes\n ~~~~~~~~~~~~~~~~~~~~\n \n-You can include a config file from another conditionally by setting a\n+You can conditionally include a config file from another by setting a\n `includeIf..path` variable to the name of the file to be\n included.\n \ndiff --git a/Documentation/config/apply.txt b/Documentation/config/apply.txt\nindex 8fb8ef763df..3f9ff19db6b 100644\n--- a/Documentation/config/apply.txt\n+++ b/Documentation/config/apply.txt\n@@ -2,7 +2,7 @@ apply.ignoreWhitespace::\n \tWhen set to 'change', tells 'git apply' to ignore changes in\n \twhitespace, in the same way as the `--ignore-space-change`\n \toption.\n-\tWhen set to one of: no, none, never, false tells 'git apply' to\n+\tWhen set to one of: no, none, never, false, it tells 'git apply' to\n \trespect all whitespace differences.\n \tSee linkgit:git-apply[1].\n \ndiff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt\nindex 445341a906b..2b05ed3574b 100644\n--- a/Documentation/config/branch.txt\n+++ b/Documentation/config/branch.txt\n@@ -36,7 +36,7 @@ branch.sort::\n \n branch..remote::\n \tWhen on branch , it tells 'git fetch' and 'git push'\n-\twhich remote to fetch from/push to. The remote to push to\n+\twhich remote to fetch from or push to. The remote to push to\n \tmay be overridden with `remote.pushDefault` (for all branches).\n \tThe remote to push to, for the current branch, may be further\n \toverridden by `branch..pushRemote`. If no remote is\ndiff --git a/Documentation/config/clone.txt b/Documentation/config/clone.txt\nindex 26f4fb137a7..a16b1b6fa34 100644\n--- a/Documentation/config/clone.txt\n+++ b/Documentation/config/clone.txt\n@@ -4,8 +4,8 @@ clone.defaultRemoteName::\n \toption to linkgit:git-clone[1].\n \n clone.rejectShallow::\n-\tReject to clone a repository if it is a shallow one, can be overridden by\n-\tpassing option `--reject-shallow` in command line. See linkgit:git-clone[1]\n+\tReject to clone a repository if it is a shallow one; this can be overridden by\n+\tpassing the `--reject-shallow` option on the command line. See linkgit:git-clone[1]\n \n clone.filterSubmodules::\n \tIf a partial clone filter is provided (see `--filter` in\ndiff --git a/Documentation/config/credential.txt b/Documentation/config/credential.txt\nindex 512f31876e1..075ef8c9750 100644\n--- a/Documentation/config/credential.txt\n+++ b/Documentation/config/credential.txt\n@@ -31,6 +31,6 @@ credentialCache.ignoreSIGHUP::\n \n credentialStore.lockTimeoutMS::\n \tThe length of time, in milliseconds, for git-credential-store to retry\n-\twhen trying to lock the credentials file. Value 0 means not to retry at\n+\twhen trying to lock the credentials file. A value of 0 means not to retry at\n \tall; -1 means to try indefinitely. Default is 1000 (i.e., retry for\n \t1s).\ndiff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt\nindex 568f0f75b30..c1a7cdd6bf4 100644\n--- a/Documentation/config/fetch.txt\n+++ b/Documentation/config/fetch.txt\n@@ -52,8 +52,8 @@ fetch.pruneTags::\n \n fetch.output::\n \tControl how ref update status is printed. Valid values are\n-\t`full` and `compact`. Default value is `full`. See section\n-\tOUTPUT in linkgit:git-fetch[1] for detail.\n+\t`full` and `compact`. Default value is `full`. See the\n+\tOUTPUT section in linkgit:git-fetch[1] for detail.\n \n fetch.negotiationAlgorithm::\n \tControl how information about the commits in the local repository\ndiff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt\nindex a3c865df567..fec3eefb5b8 100644\n--- a/Documentation/config/fsck.txt\n+++ b/Documentation/config/fsck.txt\n@@ -17,7 +17,7 @@ Unlike variables like `color.ui` and `core.editor` the\n `receive.fsck.` and `fetch.fsck.` variables will not\n fall back on the `fsck.` configuration if they aren't set. To\n uniformly configure the same fsck settings in different circumstances\n-all three of them they must all set to the same values.\n+all three of them must be set to the same values.\n +\n When `fsck.` is set, errors can be switched to warnings and\n vice versa by configuring the `fsck.` setting where the\n@@ -59,7 +59,7 @@ Unlike variables like `color.ui` and `core.editor` the\n `receive.fsck.skipList` and `fetch.fsck.skipList` variables will not\n fall back on the `fsck.skipList` configuration if they aren't set. To\n uniformly configure the same fsck settings in different circumstances\n-all three of them they must all set to the same values.\n+all three of them must be set to the same values.\n +\n Older versions of Git (before 2.20) documented that the object names\n list should be sorted. This was never a requirement, the object names\ndiff --git a/Documentation/config/fsmonitor--daemon.txt b/Documentation/config/fsmonitor--daemon.txt\nindex c225c6c9e74..671f9b94628 100644\n--- a/Documentation/config/fsmonitor--daemon.txt\n+++ b/Documentation/config/fsmonitor--daemon.txt\n@@ -1,5 +1,5 @@\n fsmonitor.allowRemote::\n- By default, the fsmonitor daemon refuses to work against network-mounted\n+ By default, the fsmonitor daemon refuses to work with network-mounted\n repositories. Setting `fsmonitor.allowRemote` to `true` overrides this\n behavior. Only respected when `core.fsmonitor` is set to `true`.\n \ndiff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt\nindex ca47eb20088..17e2a8cc176 100644\n--- a/Documentation/config/gc.txt\n+++ b/Documentation/config/gc.txt\n@@ -24,7 +24,7 @@ gc.auto::\n \tdefault value is 6700.\n +\n Setting this to 0 disables not only automatic packing based on the\n-number of loose objects, but any other heuristic `git gc --auto` will\n+number of loose objects, but also any other heuristic `git gc --auto` will\n otherwise use to determine if there's work to do, such as\n `gc.autoPackLimit`.\n \ndiff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt\nindex 37e2831cd51..a31faab2edd 100644\n--- a/Documentation/config/gpg.txt\n+++ b/Documentation/config/gpg.txt\n@@ -4,7 +4,7 @@ gpg.program::\n \tsame command-line interface as GPG, namely, to verify a detached\n \tsignature, \"`gpg --verify $signature - <$file`\" is run, and the\n \tprogram is expected to signal a good signature by exiting with\n-\tcode 0, and to generate an ASCII-armored detached signature, the\n+\tcode 0. To generate an ASCII-armored detached signature, the\n \tstandard input of \"`gpg -bsau $key`\" is fed with the contents to be\n \tsigned, and the program is expected to send the result to its\n \tstandard output.\ndiff --git a/Documentation/config/http.txt b/Documentation/config/http.txt\nindex 51a70781e58..1d805fdddbc 100644\n--- a/Documentation/config/http.txt\n+++ b/Documentation/config/http.txt\n@@ -260,7 +260,7 @@ http.noEPSV::\n \n http.userAgent::\n \tThe HTTP USER_AGENT string presented to an HTTP server. The default\n-\tvalue represents the version of the client Git such as git/1.7.1.\n+\tvalue represents the version of the Git client such as git/1.7.1.\n \tThis option allows you to override this value to a more common value\n \tsuch as Mozilla/4.0. This may be necessary, for instance, if\n \tconnecting through a firewall that restricts HTTP connections to a set\ndiff --git a/Documentation/config/imap.txt b/Documentation/config/imap.txt\nindex 06166fb5c04..fa0dccc3d83 100644\n--- a/Documentation/config/imap.txt\n+++ b/Documentation/config/imap.txt\n@@ -37,7 +37,7 @@ imap.preformattedHTML::\n \tformat=fixed email. Default is `false`.\n \n imap.authMethod::\n-\tSpecify authenticate method for authentication with IMAP server.\n+\tSpecify the authentication method for authenticating with the IMAP server.\n \tIf Git was built with the NO_CURL option, or if your curl version is older\n \tthan 7.34.0, or if you're running git-imap-send with the `--no-curl`\n \toption, the only supported method is 'CRAM-MD5'. If this is not set\ndiff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt\nindex 56a7eeeffb4..e9abde9d60c 100644\n--- a/Documentation/config/mergetool.txt\n+++ b/Documentation/config/mergetool.txt\n@@ -47,7 +47,7 @@ mergetool.meld.useAutoMerge::\n \n mergetool.vimdiff.layout::\n \tThe vimdiff backend uses this variable to control how its split\n-\twindows look like. Applies even if you are using Neovim (`nvim`) or\n+\twindows appear. Applies even if you are using Neovim (`nvim`) or\n \tgVim (`gvim`) as the merge tool. See BACKEND SPECIFIC HINTS section\n ifndef::git-mergetool[]\n \tin linkgit:git-mergetool[1].\ndiff --git a/Documentation/config/pack.txt b/Documentation/config/pack.txt\nindex 3748136d141..dcd4c871b3a 100644\n--- a/Documentation/config/pack.txt\n+++ b/Documentation/config/pack.txt\n@@ -83,7 +83,7 @@ pack.indexVersion::\n \tthe new pack index with capabilities for packs larger than 4 GB\n \tas well as proper protection against the repacking of corrupted\n \tpacks. Version 2 is the default. Note that version 2 is enforced\n-\tand this config option ignored whenever the corresponding pack is\n+\tand this config option is ignored whenever the corresponding pack is\n \tlarger than 2 GB.\n +\n If you have an old Git that does not understand the version 2 `*.idx` file,\n@@ -102,8 +102,8 @@ pack.packSizeLimit::\n \tin the creation of multiple packfiles.\n +\n Note that this option is rarely useful, and may result in a larger total\n-on-disk size (because Git will not store deltas between packs), as well\n-as worse runtime performance (object lookup within multiple packs is\n+on-disk size (because Git will not store deltas between packs) and\n+worse runtime performance (object lookup within multiple packs is\n slower than a single pack, and optimizations like reachability bitmaps\n cannot cope with multiple packs).\n +\ndiff --git a/Documentation/config/receive.txt b/Documentation/config/receive.txt\nindex 85d5b5a3d2d..ae526cbf584 100644\n--- a/Documentation/config/receive.txt\n+++ b/Documentation/config/receive.txt\n@@ -19,7 +19,7 @@ receive.certNonceSeed::\n \tkey.\n \n receive.certNonceSlop::\n-\tWhen a `git push --signed` sent a push certificate with a\n+\tWhen a `git push --signed` sends a push certificate with a\n \t\"nonce\" that was issued by a receive-pack serving the same\n \trepository within this many seconds, export the \"nonce\"\n \tfound in the certificate to `GIT_PUSH_CERT_NONCE` to the\ndiff --git a/Documentation/config/safe.txt b/Documentation/config/safe.txt\nindex bde7f31459b..577df40223a 100644\n--- a/Documentation/config/safe.txt\n+++ b/Documentation/config/safe.txt\n@@ -14,7 +14,7 @@ repository that contains a bare repository and running a Git command\n within that directory.\n +\n This config setting is only respected in protected configuration (see\n-<>). This prevents the untrusted repository from tampering with\n+<>). This prevents untrusted repositories from tampering with\n this value.\n \n safe.directory::\n@@ -32,7 +32,7 @@ override any such directories specified in the system config), add a\n `safe.directory` entry with an empty value.\n +\n This config setting is only respected in protected configuration (see\n-<>). This prevents the untrusted repository from tampering with this\n+<>). This prevents untrusted repositories from tampering with this\n value.\n +\n The value of this setting is interpolated, i.e. `~/` expands to a\ndiff --git a/Documentation/config/submodule.txt b/Documentation/config/submodule.txt\nindex 6490527b45b..665419fa135 100644\n--- a/Documentation/config/submodule.txt\n+++ b/Documentation/config/submodule.txt\n@@ -2,7 +2,7 @@ submodule..url::\n \tThe URL for a submodule. This variable is copied from the .gitmodules\n \tfile to the git config via 'git submodule init'. The user can change\n \tthe configured URL before obtaining the submodule via 'git submodule\n-\tupdate'. If neither submodule..active or submodule.active are\n+\tupdate'. If neither submodule..active nor submodule.active are\n \tset, the presence of this variable is used as a fallback to indicate\n \twhether the submodule is of interest to git commands.\n \tSee linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.\ndiff --git a/Documentation/config/trace2.txt b/Documentation/config/trace2.txt\nindex fe1642f0d40..3b6bca2b7ae 100644\n--- a/Documentation/config/trace2.txt\n+++ b/Documentation/config/trace2.txt\n@@ -66,6 +66,6 @@ trace2.destinationDebug::\n \n trace2.maxFiles::\n \tInteger. When writing trace files to a target directory, do not\n-\twrite additional traces if we would exceed this many files. Instead,\n+\twrite additional traces if doing so would exceed this many files. Instead,\n \twrite a sentinel file that will block further tracing to this\n \tdirectory. Defaults to 0, which disables this check.\ndiff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.txt\nindex c3ac767d1e4..55e13428db1 100644\n--- a/Documentation/config/transfer.txt\n+++ b/Documentation/config/transfer.txt\n@@ -7,7 +7,7 @@ transfer.credentialsInUrl::\n \tand any other direct use of the configured URL.\n +\n Note that this is currently limited to detecting credentials in\n-`remote..url` configuration, it won't detect credentials in\n+`remote..url` configuration; it won't detect credentials in\n `remote..pushurl` configuration.\n +\n You might want to enable this to prevent inadvertent credentials\n@@ -26,7 +26,7 @@ exposure, e.g. because:\n documented in procfs(5) allows for configuring this behavior.\n +\n If such concerns don't apply to you then you probably don't need to be\n-concerned about credentials exposure due to storing that sensitive\n+concerned about credentials exposure due to storing sensitive\n data in git's configuration files. If you do want to use this, set\n `transfer.credentialsInUrl` to one of these values:\n +\ndiff --git a/Documentation/config/user.txt b/Documentation/config/user.txt\nindex ec9233b060a..958e62464a5 100644\n--- a/Documentation/config/user.txt\n+++ b/Documentation/config/user.txt\n@@ -10,7 +10,7 @@ committer.email::\n \tIf you need the `author` or `committer` to be different, the\n \t`author.name`, `author.email`, `committer.name` or\n \t`committer.email` variables can be set.\n-\tAlso, all of these can be overridden by the `GIT_AUTHOR_NAME`,\n+\tAll of these can be overridden by the `GIT_AUTHOR_NAME`,\n \t`GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`,\n \t`GIT_COMMITTER_EMAIL` and `EMAIL` environment variables.\n +\ndiff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt\nindex 546adf79e5a..55df903abd1 100644\n--- a/Documentation/diff-generate-patch.txt\n+++ b/Documentation/diff-generate-patch.txt\n@@ -146,7 +146,7 @@ information about detected contents movement (renames and\n copying detection) are designed to work with diff of two\n and are not used by combined diff format.\n \n-3. It is followed by two-line from-file/to-file header\n+3. It is followed by a two-line from-file/to-file header:\n \n --- a/file\n +++ b/file\n@@ -157,7 +157,7 @@ files.\n +\n However, if the --combined-all-paths option is provided, instead of a\n two-line from-file/to-file you get a N+1 line from-file/to-file header,\n-where N is the number of parents in the merge commit\n+where N is the number of parents in the merge commit:\n \n --- a/file\n --- a/file\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex 35fae7c87c8..8917ce7a9e1 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -733,7 +733,7 @@ matches \"`fooasdfbar`\" and \"`foo/bar/baz/asdf`\" but not \"`foobarx`\".\n --rotate-to=::\n \tDiscard the files before the named from the output\n \t(i.e. 'skip to'), or move them to the end of the output\n-\t(i.e. 'rotate to'). These were invented primarily for use\n+\t(i.e. 'rotate to'). These options were invented primarily for the use\n \tof the `git difftool` command, and may not be very useful\n \totherwise.\n \ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\nindex 5e16e6db7e2..b6e7510d068 100644\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -159,7 +159,7 @@ discouraged.\n \n --allow-binary-replacement::\n --binary::\n-\tHistorically we did not allow binary patch applied\n+\tHistorically we did not allow binary patch application\n \twithout an explicit permission from the user, and this\n \tflag was the way to do so. Currently we always allow binary\n \tpatch application, so this is a no-op.\ndiff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt\nindex 6bab201d375..98526f2beba 100644\n--- a/Documentation/git-archive.txt\n+++ b/Documentation/git-archive.txt\n@@ -21,14 +21,14 @@ structure for the named tree, and writes it out to the standard\n output. If is specified it is\n prepended to the filenames in the archive.\n \n-'git archive' behaves differently when given a tree ID versus when\n-given a commit ID or tag ID. In the first case the current time is\n-used as the modification time of each file in the archive. In the latter\n-case the commit time as recorded in the referenced commit object is\n-used instead. Additionally the commit ID is stored in a global\n-extended pax header if the tar format is used; it can be extracted\n-using 'git get-tar-commit-id'. In ZIP files it is stored as a file\n-comment.\n+'git archive' behaves differently when given a tree ID as opposed to a\n+commit ID or tag ID. When a tree ID is provided, the current time is\n+used as the modification time of each file in the archive. On the\n+other hand, when a commit ID or tag ID is provided, the commit time as\n+recorded in the referenced commit object is used instead.\n+Additionally the commit ID is stored in a global extended pax header\n+if the tar format is used; it can be extracted using 'git\n+get-tar-commit-id'. In ZIP files it is stored as a file comment.\n \n OPTIONS\n -------\ndiff --git a/Documentation/git-bugreport.txt b/Documentation/git-bugreport.txt\nindex eca726e5791..392d9eb6aec 100644\n--- a/Documentation/git-bugreport.txt\n+++ b/Documentation/git-bugreport.txt\n@@ -13,10 +13,11 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Captures information about the user's machine, Git client, and repository state,\n-as well as a form requesting information about the behavior the user observed,\n-into a single text file which the user can then share, for example to the Git\n-mailing list, in order to report an observed bug.\n+Collects information about the user's machine, Git client, and repository\n+state, in addition to a form requesting information about the behavior the\n+user observed, and stores it in a single text file which the user can then\n+share, for example to the Git mailing list, in order to report an observed\n+bug.\n \n The following information is requested from the user:\n \ndiff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt\nindex 01dbd5cbf54..d1738f43308 100644\n--- a/Documentation/git-checkout-index.txt\n+++ b/Documentation/git-checkout-index.txt\n@@ -18,7 +18,7 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Will copy all files listed from the index to the working directory\n+Copies all listed files from the index to the working directory\n (not overwriting existing files).\n \n OPTIONS\ndiff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt\nindex cb9b4d2e460..b28cc3a510a 100644\n--- a/Documentation/git-count-objects.txt\n+++ b/Documentation/git-count-objects.txt\n@@ -12,7 +12,7 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-This counts the number of unpacked object files and disk space consumed by\n+Counts the number of unpacked object files and disk space consumed by\n them, to help you decide when it is a good time to repack.\n \n \n@@ -20,7 +20,7 @@ OPTIONS\n -------\n -v::\n --verbose::\n-\tReport in more detail:\n+\tProvide more detailed reports:\n +\n count: the number of loose objects\n +\ndiff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt\nindex a220afed4f3..918a0aa42b2 100644\n--- a/Documentation/git-credential.txt\n+++ b/Documentation/git-credential.txt\n@@ -94,7 +94,7 @@ unlocked) before it returned `password=secr3t`.\n that `git credential` will ask for a new password in its next\n invocation. In either case, `git credential` should be fed with\n the credential description obtained from step (2) (which also\n- contain the ones provided in step (1)).\n+ contains the fields provided in step (1)).\n \n [[IOFMT]]\n INPUT/OUTPUT FORMAT\ndiff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt\nindex c30d8f0da8a..4de1d4c8f11 100644\n--- a/Documentation/git-diff-index.txt\n+++ b/Documentation/git-diff-index.txt\n@@ -13,10 +13,10 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Compares the content and mode of the blobs found in a tree object\n+Compare the content and mode of the blobs found in a tree object\n with the corresponding tracked files in the working tree, or with the\n corresponding paths in the index. When arguments are present,\n-compares only paths matching those patterns. Otherwise all tracked\n+compare only paths matching those patterns. Otherwise all tracked\n files are compared.\n \n OPTIONS\ndiff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt\nindex 274d5eaba93..81caad5c95c 100644\n--- a/Documentation/git-diff-tree.txt\n+++ b/Documentation/git-diff-tree.txt\n@@ -15,7 +15,7 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Compares the content and mode of the blobs found via two tree objects.\n+Compare the content and mode of blobs found via two tree objects.\n \n If there is only one given, the commit is compared with its parents\n (see --stdin below).\ndiff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt\nindex 8b5dd6add00..a6a054f86d2 100644\n--- a/Documentation/git-fast-import.txt\n+++ b/Documentation/git-fast-import.txt\n@@ -622,7 +622,7 @@ in octal. Git only supports the following modes:\n * `100755` or `755`: A normal, but executable, file.\n * `120000`: A symlink, the content of the file will be the link target.\n * `160000`: A gitlink, SHA-1 of the object refers to a commit in\n- another repository. Git links can only be specified by SHA or through\n+ another repository. Git links can only be specified either by SHA or through\n a commit mark. They are used to implement submodules.\n * `040000`: A subdirectory. Subdirectories can only be specified by\n SHA or through a tree mark set with `--import-marks`.\ndiff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt\nindex 8577f7a7d40..ef4719ae41c 100644\n--- a/Documentation/git-hash-object.txt\n+++ b/Documentation/git-hash-object.txt\n@@ -39,10 +39,10 @@ OPTIONS\n \tof from the command-line.\n \n --path::\n-\tHash object as it were located at the given path. The location of\n-\tfile does not directly influence on the hash value, but path is\n-\tused to determine what Git filters should be applied to the object\n-\tbefore it can be placed to the object database, and, as result of\n+\tHash object as if it were located at the given path. The location of\n+\tthe file does not directly influence the hash value, but the path is\n+\tused to determine which Git filters should be applied to the object\n+\tbefore it can be placed in the object database. As a result of\n \tapplying filters, the actual blob put into the object database may\n \tdiffer from the given file. This option is mainly useful for hashing\n \ttemporary files located outside of the working directory or files\ndiff --git a/Documentation/git-help.txt b/Documentation/git-help.txt\nindex 2b0b5e390dc..7cb4b4bda18 100644\n--- a/Documentation/git-help.txt\n+++ b/Documentation/git-help.txt\n@@ -109,7 +109,7 @@ other display programs (see below).\n \tformat. A web browser will be used for that purpose.\n +\n The web browser can be specified using the configuration variable\n-`help.browser`, or `web.browser` if the former is not set. If none of\n+`help.browser`, or `web.browser` if the former is not set. If neither of\n these config variables is set, the 'git web{litdd}browse' helper script\n (called by 'git help') will pick a suitable default. See\n linkgit:git-web{litdd}browse[1] for more information about this.\ndiff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt\nindex 0c5c0dde19f..f37ddaded82 100644\n--- a/Documentation/git-http-backend.txt\n+++ b/Documentation/git-http-backend.txt\n@@ -23,7 +23,7 @@ discussion of `GIT_PROTOCOL` in the ENVIRONMENT section below.\n It verifies that the directory has the magic file\n \"git-daemon-export-ok\", and it will refuse to export any Git directory\n that hasn't explicitly been marked for export this way (unless the\n-`GIT_HTTP_EXPORT_ALL` environmental variable is set).\n+`GIT_HTTP_EXPORT_ALL` environment variable is set).\n \n By default, only the `upload-pack` service is enabled, which serves\n 'git fetch-pack' and 'git ls-remote' clients, which are invoked from\n@@ -42,12 +42,12 @@ http.getanyfile::\n \tany file within the repository, including objects that are\n \tno longer reachable from a branch but are still present.\n \tIt is enabled by default, but a repository can disable it\n-\tby setting this configuration item to `false`.\n+\tby setting this configuration value to `false`.\n \n http.uploadpack::\n \tThis serves 'git fetch-pack' and 'git ls-remote' clients.\n \tIt is enabled by default, but a repository can disable it\n-\tby setting this configuration item to `false`.\n+\tby setting this configuration value to `false`.\n \n http.receivepack::\n \tThis serves 'git send-pack' clients, allowing push. It is\n@@ -265,12 +265,12 @@ by the invoking web server, including:\n * QUERY_STRING\n * REQUEST_METHOD\n \n-The `GIT_HTTP_EXPORT_ALL` environmental variable may be passed to\n+The `GIT_HTTP_EXPORT_ALL` environment variable may be passed to\n 'git-http-backend' to bypass the check for the \"git-daemon-export-ok\"\n file in each repository before allowing export of that repository.\n \n The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the\n-`http.maxRequestBuffer` config variable) may be set to change the\n+`http.maxRequestBuffer` config option) may be set to change the\n largest ref negotiation request that git will handle during a fetch; any\n fetch requiring a larger buffer will not succeed. This value should not\n normally need to be changed, but may be helpful if you are fetching from\ndiff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt\nindex 319062c021b..4ec7c68d3b9 100644\n--- a/Documentation/git-http-fetch.txt\n+++ b/Documentation/git-http-fetch.txt\n@@ -31,7 +31,7 @@ commit-id::\n \tReport what is downloaded.\n \n -w ::\n- Writes the commit-id into the filename under $GIT_DIR/refs/ on\n+\tWrites the commit-id into the specified filename under $GIT_DIR/refs/ on\n the local end after the transfer is complete.\n \n --stdin::\ndiff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt\nindex 7c6a6dd7f6a..8b4a5791c8c 100644\n--- a/Documentation/git-http-push.txt\n+++ b/Documentation/git-http-push.txt\n@@ -83,8 +83,8 @@ and where it is pushed is determined by using the destination side.\n Without `--force`, the ref is stored at the remote only if\n does not exist, or is a proper subset (i.e. an\n ancestor) of . This check, known as \"fast-forward check\",\n-is performed in order to avoid accidentally overwriting the\n-remote ref and lose other peoples' commits from there.\n+is performed to avoid accidentally overwriting the\n+remote ref and losing other peoples' commits from there.\n \n With `--force`, the fast-forward check is disabled for all refs.\n \ndiff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt\nindex 4e71c256ecb..6486620c3d8 100644\n--- a/Documentation/git-index-pack.txt\n+++ b/Documentation/git-index-pack.txt\n@@ -16,10 +16,10 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Reads a packed archive (.pack) from the specified file, and\n-builds a pack index file (.idx) for it. Optionally writes a\n+Reads a packed archive (.pack) from the specified file,\n+builds a pack index file (.idx) for it, and optionally writes a\n reverse-index (.rev) for the specified pack. The packed\n-archive together with the pack index can then be placed in\n+archive, together with the pack index, can then be placed in\n the objects/pack/ directory of a Git repository.\n \n \n@@ -68,8 +68,8 @@ OPTIONS\n \tupdated to use objects contained in the pack.\n \n --keep=::\n-\tLike --keep create a .keep file before moving the index into\n-\tits final destination, but rather than creating an empty file\n+\tLike --keep, create a .keep file before moving the index into\n+\tits final destination. However, instead of creating an empty file\n \tplace '' followed by an LF into the .keep file. The ''\n \tmessage can later be searched for within all .keep files to\n \tlocate any which have outlived their usefulness.\ndiff --git a/Documentation/git-init.txt b/Documentation/git-init.txt\nindex 160dea1372c..30ab86ab96a 100644\n--- a/Documentation/git-init.txt\n+++ b/Documentation/git-init.txt\n@@ -99,7 +99,7 @@ specified.\n \n 'group' (or 'true')::\n \n-Make the repository group-writable, (and g+sx, since the git group may be not\n+Make the repository group-writable, (and g+sx, since the git group may not be\n the primary group of all users). This is used to loosen the permissions of an\n otherwise safe umask(2) value. Note that the umask still applies to the other\n permission bits (e.g. if umask is '0022', using 'group' will not remove read\ndiff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt\nindex 1bc0328bb78..60d1cca1496 100644\n--- a/Documentation/git-ls-files.txt\n+++ b/Documentation/git-ls-files.txt\n@@ -25,12 +25,12 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-This merges the file listing in the index with the actual working\n+This command merges the file listing in the index with the actual working\n directory list, and shows different combinations of the two.\n \n-One or more of the options below may be used to determine the files\n+Several flags can be used to determine which files are\n shown, and each file may be printed multiple times if there are\n-multiple entries in the index or multiple statuses are applicable for\n+multiple entries in the index or if multiple statuses are applicable for\n the relevant file selection options.\n \n OPTIONS\ndiff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt\nindex 805e5a2e3a0..51d0f7e94b6 100644\n--- a/Documentation/git-maintenance.txt\n+++ b/Documentation/git-maintenance.txt\n@@ -102,9 +102,9 @@ prefetch::\n \trequested refs within `refs/prefetch/`. Also, tags are not updated.\n +\n This is done to avoid disrupting the remote-tracking branches. The end users\n-expect these refs to stay unmoved unless they initiate a fetch. With prefetch\n-task, however, the objects necessary to complete a later real fetch would\n-already be obtained, so the real fetch would go faster. In the ideal case,\n+expect these refs to stay unmoved unless they initiate a fetch. However,\n+with the prefetch task, the objects necessary to complete a later real fetch\n+would already be obtained, making the real fetch faster. In the ideal case,\n it will just become an update to a bunch of remote-tracking branches without\n any object transfer.\n \ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 8625c5cb0ec..e8ab3403191 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -336,7 +336,7 @@ After seeing a conflict, you can do two things:\n You can work through the conflict with a number of tools:\n \n * Use a mergetool. `git mergetool` to launch a graphical\n- mergetool which will work you through the merge.\n+ mergetool which will work through the merge with you.\n \n * Look at the diffs. `git diff` will show a three-way diff,\n highlighting changes from both the `HEAD` and `MERGE_HEAD`\ndiff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt\nindex 07535f6576e..800a3cbe6f3 100644\n--- a/Documentation/git-mergetool.txt\n+++ b/Documentation/git-mergetool.txt\n@@ -115,7 +115,7 @@ These are safe to remove once a file has been merged and its\n `git mergetool` session has completed.\n \n Setting the `mergetool.keepBackup` configuration variable to `false`\n-causes `git mergetool` to automatically remove the backup as files\n+causes `git mergetool` to automatically remove the backup files as files\n are successfully merged.\n \n BACKEND SPECIFIC HINTS\ndiff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt\nindex 76b44f4da10..383f09dd333 100644\n--- a/Documentation/git-mktree.txt\n+++ b/Documentation/git-mktree.txt\n@@ -25,13 +25,13 @@ OPTIONS\n \n --missing::\n \tAllow missing objects. The default behaviour (without this option)\n-\tis to verify that each tree entry's sha1 identifies an existing\n+\tis to verify that each tree entry's hash identifies an existing\n \tobject. This option has no effect on the treatment of gitlink entries\n \t(aka \"submodules\") which are always allowed to be missing.\n \n --batch::\n \tAllow building of more than one tree object before exiting. Each\n-\ttree is separated by a single blank line. The final new-line is\n+\ttree is separated by a single blank line. The final newline is\n \toptional. Note - if the `-z` option is used, lines are terminated\n \twith NUL.\n \ndiff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt\nindex 0b393715d70..605a92e224e 100644\n--- a/Documentation/git-range-diff.txt\n+++ b/Documentation/git-range-diff.txt\n@@ -70,7 +70,7 @@ to revert to color all lines according to the outer diff markers\n \tDefaults to 60. Try a larger value if `git range-diff` erroneously\n \tconsiders a large change a total rewrite (deletion of one commit\n \tand addition of another), and a smaller one in the reverse case.\n-\tSee the ``Algorithm`` section below for an explanation why this is\n+\tSee the ``Algorithm`` section below for an explanation of why this is\n \tneeded.\n \n --left-only::\ndiff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt\nindex b09707474df..32065318532 100644\n--- a/Documentation/git-read-tree.txt\n+++ b/Documentation/git-read-tree.txt\n@@ -25,7 +25,7 @@ fast-forward (i.e. 2-way) merge, or a 3-way merge, with the `-m`\n flag. When used with `-m`, the `-u` flag causes it to also update\n the files in the work tree with the result of the merge.\n \n-Trivial merges are done by 'git read-tree' itself. Only conflicting paths\n+Only trivial merges are done by 'git read-tree' itself. Only conflicting paths\n will be in unmerged state when 'git read-tree' returns.\n \n OPTIONS\ndiff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt\nindex 88ea7e1cc01..17d84f23c99 100644\n--- a/Documentation/git-remote-ext.txt\n+++ b/Documentation/git-remote-ext.txt\n@@ -82,7 +82,7 @@ begins with `ext::`. Examples:\n \n \"ext::ssh -i /home/foo/.ssh/somekey user@host.example %S 'foo/repo'\"::\n \tLike host.example:foo/repo, but use /home/foo/.ssh/somekey as\n-\tkeypair and user as user on remote side. This avoids needing to\n+\tkeypair and user as user on remote side. This avoids the need to\n \tedit .ssh/config.\n \n \"ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo\"::\ndiff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt\nindex 4017157949e..cbc0ece61e3 100644\n--- a/Documentation/git-repack.txt\n+++ b/Documentation/git-repack.txt\n@@ -165,7 +165,7 @@ depth is 4095.\n \tExclude the given pack from repacking. This is the equivalent\n \tof having `.keep` file on the pack. `` is the\n \tpack file name without leading directory (e.g. `pack-123.pack`).\n-\tThe option could be specified multiple times to keep multiple\n+\tThe option can be specified multiple times to keep multiple\n \tpacks.\n \n --unpack-unreachable=::\ndiff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt\nindex c70444705b5..ad546a37cff 100644\n--- a/Documentation/git-restore.txt\n+++ b/Documentation/git-restore.txt\n@@ -105,7 +105,7 @@ in linkgit:git-checkout[1] for details.\n \tspecified. Unmerged paths on the working tree are left alone.\n \n --ignore-skip-worktree-bits::\n-\tIn sparse checkout mode, by default is to only update entries\n+\tIn sparse checkout mode, the default is to only update entries\n \tmatched by `` and sparse patterns in\n \t$GIT_DIR/info/sparse-checkout. This option ignores the sparse\n \tpatterns and unconditionally restores any files in\ndiff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt\nindex 51029a22715..fbe913ee746 100644\n--- a/Documentation/git-rev-list.txt\n+++ b/Documentation/git-rev-list.txt\n@@ -17,7 +17,7 @@ DESCRIPTION\n :git-rev-list: 1\n include::rev-list-description.txt[]\n \n-'rev-list' is a very essential Git command, since it\n+'rev-list' is an essential Git command, since it\n provides the ability to build and traverse commit ancestry graphs. For\n this reason, it has a lot of different options that enables it to be\n used by commands as different as 'git bisect' and\ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex 6a4968f68a3..2294e9a519a 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -36,7 +36,7 @@ Each of these options must appear first on the command line.\n --sq-quote::\n \tUse 'git rev-parse' in shell quoting mode (see SQ-QUOTE\n \tsection below). In contrast to the `--sq` option below, this\n-\tmode does only quoting. Nothing else is done to command input.\n+\tmode only does quoting. Nothing else is done to command input.\n \n Options for --parseopt\n ~~~~~~~~~~~~~~~~~~~~~~\ndiff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt\nindex 492a82323da..e90d041817e 100644\n--- a/Documentation/git-send-email.txt\n+++ b/Documentation/git-send-email.txt\n@@ -468,8 +468,8 @@ Information\n \n --dump-aliases::\n \tInstead of the normal operation, dump the shorthand alias names from\n-\tthe configured alias file(s), one per line in alphabetical order. Note,\n-\tthis only includes the alias name and not its expanded email addresses.\n+\tthe configured alias file(s), one per line in alphabetical order. Note\n+\tthat this only includes the alias name and not its expanded email addresses.\n \tSee 'sendemail.aliasesfile' for more information about aliases.\n \n \ndiff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt\nindex 595b002152f..e76c262d7f9 100644\n--- a/Documentation/git-send-pack.txt\n+++ b/Documentation/git-send-pack.txt\n@@ -55,7 +55,7 @@ be in a separate packet, and the list must end with a flush packet.\n --force::\n \tUsually, the command refuses to update a remote ref that\n \tis not an ancestor of the local ref used to overwrite it.\n-\tThis flag disables the check. What this means is that\n+\tThis flag disables the check. This means that\n \tthe remote repository can lose commits; use it with\n \tcare.\n \n@@ -117,7 +117,7 @@ When one or more '' are specified explicitly (whether on the\n command line or via `--stdin`), it can be either a\n single pattern, or a pair of such pattern separated by a colon\n \":\" (this means that a ref name cannot have a colon in it). A\n-single pattern '' is just a shorthand for ':'.\n+single pattern '' is just shorthand for ':'.\n \n Each pattern pair consists of the source side (before the colon)\n and the destination side (after the colon). The ref to be\n@@ -143,9 +143,9 @@ name. See linkgit:git-rev-parse[1].\n \n Without `--force`, the ref is stored at the remote only if\n does not exist, or is a proper subset (i.e. an\n-ancestor) of . This check, known as \"fast-forward check\",\n-is performed in order to avoid accidentally overwriting the\n-remote ref and lose other peoples' commits from there.\n+ancestor) of . This check, known as the \"fast-forward check\",\n+is performed to avoid accidentally overwriting the\n+remote ref and losing other people's commits from there.\n \n With `--force`, the fast-forward check is disabled for all refs.\n \ndiff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\nindex b27d127b5e2..51f38218f0d 100644\n--- a/Documentation/git-status.txt\n+++ b/Documentation/git-status.txt\n@@ -251,7 +251,7 @@ Submodules have more state and instead report\n \t\tm the submodule has modified content\n \t\t? the submodule has untracked files\n \n-since modified content or untracked files in a submodule cannot be added\n+This is since modified content or untracked files in a submodule cannot be added\n via `git add` in the superproject to prepare a commit.\n \n 'm' and '?' are applied recursively. For example if a nested submodule\ndiff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt\nindex 2438f76da05..3dc630da4b7 100644\n--- a/Documentation/git-stripspace.txt\n+++ b/Documentation/git-stripspace.txt\n@@ -41,7 +41,7 @@ OPTIONS\n \n -c::\n --comment-lines::\n-\tPrepend comment character and blank to each line. Lines will automatically\n+\tPrepend the comment character and a blank space to each line. Lines will automatically\n \tbe terminated with a newline. On empty lines, only the comment character\n \twill be prepended.\n \ndiff --git a/Documentation/git-var.txt b/Documentation/git-var.txt\nindex c38fb3968bc..0680568dfda 100644\n--- a/Documentation/git-var.txt\n+++ b/Documentation/git-var.txt\n@@ -19,7 +19,7 @@ no value.\n OPTIONS\n -------\n -l::\n-\tCause the logical variables to be listed. In addition, all the\n+\tDisplay the logical variables. In addition, all the\n \tvariables of the Git configuration file .git/config are listed\n \tas well. (However, the configuration variables listing functionality\n \tis deprecated in favor of `git config -l`.)\ndiff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt\nindex 8b63ceb00e7..5cbb31f33e3 100644\n--- a/Documentation/git-whatchanged.txt\n+++ b/Documentation/git-whatchanged.txt\n@@ -20,7 +20,7 @@ New users are encouraged to use linkgit:git-log[1] instead. The\n `whatchanged` command is essentially the same as linkgit:git-log[1]\n but defaults to show the raw format diff output and to skip merges.\n \n-The command is kept primarily for historical reasons; fingers of\n+The command is primarily kept for historical reasons; fingers of\n many people who learned Git long before `git log` was invented by\n reading Linux kernel mailing list are trained to type it.\n \ndiff --git a/Documentation/gitformat-bundle.txt b/Documentation/gitformat-bundle.txt\nindex 00e0a20e657..f1acf196e10 100644\n--- a/Documentation/gitformat-bundle.txt\n+++ b/Documentation/gitformat-bundle.txt\n@@ -86,10 +86,10 @@ In the bundle format, there can be a comment following a prerequisite obj-id.\n This is a comment and it has no specific meaning. The writer of the bundle MAY\n put any string here. The reader of the bundle MUST ignore the comment.\n \n-Note on the shallow clone and a Git bundle\n-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+Note on shallow clones and Git bundles\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n-Note that the prerequisites does not represent a shallow-clone boundary. The\n+Note that the prerequisites do not represent a shallow-clone boundary. The\n semantics of the prerequisites and the shallow-clone boundaries are different,\n and the Git bundle v2 format cannot represent a shallow clone repository.\n \ndiff --git a/Documentation/githooks.txt b/Documentation/githooks.txt\nindex 86f804720ae..63eb030b34d 100644\n--- a/Documentation/githooks.txt\n+++ b/Documentation/githooks.txt\n@@ -345,7 +345,7 @@ for the user.\n \n The default 'update' hook, when enabled--and with\n `hooks.allowunannotated` config option unset or set to false--prevents\n-unannotated tags to be pushed.\n+unannotated tags from being pushed.\n \n [[proc-receive]]\n proc-receive\ndiff --git a/Documentation/gitprotocol-capabilities.txt b/Documentation/gitprotocol-capabilities.txt\nindex 0fb5ea0c1ca..5d5e39a7039 100644\n--- a/Documentation/gitprotocol-capabilities.txt\n+++ b/Documentation/gitprotocol-capabilities.txt\n@@ -61,8 +61,8 @@ complete cut across the DAG, or the client has said \"done\".\n Without multi_ack, a client sends have lines in --date-order until\n the server has found a common base. That means the client will send\n have lines that are already known by the server to be common, because\n-they overlap in time with another branch that the server hasn't found\n-a common base on yet.\n+they overlap in time with another branch on which the server hasn't found\n+a common base yet.\n \n For example suppose the client has commits in caps that the server\n doesn't and the server has commits in lower case that the client\n@@ -135,7 +135,7 @@ to disable the feature in a backwards-compatible manner.\n side-band, side-band-64k\n ------------------------\n \n-This capability means that server can send, and client understand multiplexed\n+This capability means that the server can send, and the client can understand, multiplexed\n progress reports and error info interleaved with the packfile itself.\n \n These two options are mutually exclusive. A modern client always\n@@ -163,14 +163,14 @@ Further, with side-band and its up to 1000-byte messages, it's actually\n same deal, you have up to 65519 bytes of data and 1 byte for the stream\n code.\n \n-The client MUST send only maximum of one of \"side-band\" and \"side-\n-band-64k\". Server MUST diagnose it as an error if client requests\n+The client MUST send only one of \"side-band\" and \"side-\n+band-64k\". The server MUST diagnose it as an error if client requests\n both.\n \n ofs-delta\n ---------\n \n-Server can send, and client understand PACKv2 with delta referring to\n+The server can send, and the client can understand, PACKv2 with delta referring to\n its base by position in pack rather than by an obj-id. That is, they can\n send/read OBJ_OFS_DELTA (aka type 6) in a packfile.\n \n@@ -252,7 +252,7 @@ the current shallow boundary, instead of the depth from remote refs.\n no-progress\n -----------\n \n-The client was started with \"git clone -q\" or something, and doesn't\n+The client was started with \"git clone -q\" or something similar, and doesn't\n want that side band 2. Basically the client just says \"I do not\n wish to receive stream 2 on sideband, so do not send it to me, and if\n you did, I will drop it on the floor anyway\". However, the sideband\ndiff --git a/Documentation/gitprotocol-http.txt b/Documentation/gitprotocol-http.txt\nindex ccc13f0a407..fcc2b25ee9f 100644\n--- a/Documentation/gitprotocol-http.txt\n+++ b/Documentation/gitprotocol-http.txt\n@@ -379,7 +379,7 @@ C: Place any object seen into set `advertised`.\n C: Build an empty set, `common`, to hold the objects that are later\n determined to be on both ends.\n \n-C: Build a set, `want`, of the objects from `advertised` the client\n+C: Build a set, `want`, of the objects from `advertised` that the client\n wants to fetch, based on what it saw during ref discovery.\n \n C: Start a queue, `c_pending`, ordered by commit time (popping newest\n@@ -423,7 +423,7 @@ multiple commands. Object names MUST be given using the object format\n negotiated through the `object-format` capability (default SHA-1).\n \n The `have` list is created by popping the first 32 commits\n-from `c_pending`. Less can be supplied if `c_pending` empties.\n+from `c_pending`. Fewer can be supplied if `c_pending` empties.\n \n If the client has sent 256 \"have\" commits and has not yet\n received one of those back from `s_common`, or the client has\ndiff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt\nindex af6bf3c45ec..bb9cbad7f3f 100644\n--- a/Documentation/gitweb.txt\n+++ b/Documentation/gitweb.txt\n@@ -20,13 +20,13 @@ Gitweb provides a web interface to Git repositories. Its features include:\n * Browsing every revision of the repository.\n * Viewing the contents of files in the repository at any revision.\n * Viewing the revision log of branches, history of files and directories,\n- see what was changed when, by who.\n+ seeing what was changed, when, and by whom.\n * Viewing the blame/annotation details of any file (if enabled).\n * Generating RSS and Atom feeds of commits, for any branch.\n The feeds are auto-discoverable in modern web browsers.\n * Viewing everything that was changed in a revision, and step through\n revisions one at a time, viewing the history of the repository.\n-* Finding commits which commit messages matches given search term.\n+* Finding commits whose commit messages match a given search term.\n \n See http://repo.or.cz/w/git.git/tree/HEAD:/gitweb/[] for gitweb source code,\n browsed using gitweb itself.\ndiff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt\nindex d07c6d44e53..29c473e5e04 100644\n--- a/Documentation/howto/maintain-git.txt\n+++ b/Documentation/howto/maintain-git.txt\n@@ -104,7 +104,7 @@ by doing the following:\n files in mbox format).\n \n - Write his own patches to address issues raised on the list but\n- nobody has stepped up solving. Send it out just like other\n+ nobody has stepped up to solve. Send it out just like other\n contributors do, and pick them up just like patches from other\n contributors (see above).\n \n@@ -417,7 +417,7 @@ are merged together, the reference to the variable newly added by\n the latter topic will still use the old name in the result.\n \n The Meta/Reintegrate script that is used by redo-jch and redo-seen\n-scripts implements a crude but usable way to work this issue around.\n+scripts implements a crude but usable way to work around this issue.\n When the script merges branch $X, it checks if \"refs/merge-fix/$X\"\n exists, and if so, the effect of it is squashed into the result of\n the mechanical merge. In other words,\ndiff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt\nindex a499a94ac22..3bd581ac359 100644\n--- a/Documentation/howto/using-merge-subtree.txt\n+++ b/Documentation/howto/using-merge-subtree.txt\n@@ -11,7 +11,7 @@ Message-ID: \n How to use the subtree merge strategy\n =====================================\n \n-There are situations where you want to include contents in your project\n+There are situations where you want to include content in your project\n from an independently developed project. You can just pull from the\n other project as long as there are no conflicting paths.\n \ndiff --git a/Documentation/i18n.txt b/Documentation/i18n.txt\nindex 6c6baeeeb75..0efb1153d27 100644\n--- a/Documentation/i18n.txt\n+++ b/Documentation/i18n.txt\n@@ -46,7 +46,7 @@ mind.\n ------------\n +\n Commit objects created with the above setting record the value\n-of `i18n.commitEncoding` in its `encoding` header. This is to\n+of `i18n.commitEncoding` in their `encoding` header. This is to\n help other people who look at them later. Lack of this header\n implies that the commit log message is encoded in UTF-8.\n \ndiff --git a/Documentation/mergetools/vimdiff.txt b/Documentation/mergetools/vimdiff.txt\nindex 2d631e9b1f2..c36c5479392 100644\n--- a/Documentation/mergetools/vimdiff.txt\n+++ b/Documentation/mergetools/vimdiff.txt\n@@ -32,10 +32,10 @@ have special meaning:\n - `+` is used to \"open a new tab\"\n - `,` is used to \"open a new vertical split\"\n - `/` is used to \"open a new horizontal split\"\n- - `@` is used to indicate which is the file containing the final version after\n+ - `@` is used to indicate the file containing the final version after\n solving the conflicts. If not present, `MERGED` will be used by default.\n \n-The precedence of the operators is this one (you can use parentheses to change\n+The precedence of the operators is as follows (you can use parentheses to change\n it):\n \n `@` > `+` > `/` > `,`\ndiff --git a/Documentation/technical/api-simple-ipc.txt b/Documentation/technical/api-simple-ipc.txt\nindex d44ada98e7d..6c127b5dddf 100644\n--- a/Documentation/technical/api-simple-ipc.txt\n+++ b/Documentation/technical/api-simple-ipc.txt\n@@ -102,4 +102,4 @@ stateless request, receive an application-specific\n response, and disconnect. It is a one round trip facility for\n querying the server. The Simple-IPC routines hide the socket,\n named pipe, and thread pool details and allow the application\n-layer to focus on the application at hand.\n+layer to focus on the task at hand.\ndiff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.txt\nindex c2e652b71a7..687c58cebcc 100644\n--- a/Documentation/technical/bitmap-format.txt\n+++ b/Documentation/technical/bitmap-format.txt\n@@ -114,7 +114,7 @@ result in an empty bitmap (no bits set).\n \n * N entries with compressed bitmaps, one for each indexed commit\n +\n-Where `N` is the total amount of entries in this bitmap index.\n+Where `N` is the total number of entries in this bitmap index.\n Each entry contains the following:\n \n \t** {empty}\ndiff --git a/Documentation/technical/parallel-checkout.txt b/Documentation/technical/parallel-checkout.txt\nindex 47c9b6183cf..91a5eb26efd 100644\n--- a/Documentation/technical/parallel-checkout.txt\n+++ b/Documentation/technical/parallel-checkout.txt\n@@ -185,7 +185,7 @@ quite straightforward: for each parallel-eligible entry, the main\n process must remove all files that prevent this entry from being written\n (before enqueueing it). This includes any non-directory file in the\n leading path of the entry. Later, when a worker gets assigned the entry,\n-it looks again for the non-directories files and for an already existing\n+it looks again for the non-directory files and for an already existing\n file at the entry's path. If any of these checks finds something, the\n worker knows that there was a path collision.\n \ndiff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt\nindex 92fcee2bfff..b01cff6912a 100644\n--- a/Documentation/technical/partial-clone.txt\n+++ b/Documentation/technical/partial-clone.txt\n@@ -265,7 +265,7 @@ Future Work\n - Improve the way to specify the order in which promisor remotes are\n tried.\n +\n-For example this could allow to specify explicitly something like:\n+For example this could allow specifying explicitly something like:\n \"When fetching from this remote, I want to use these promisor remotes\n in this order, though, when pushing or fetching to that remote, I want\n to use those promisor remotes in that order.\"\ndiff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt\nindex ceda4bbfda4..783e87e6aa4 100644\n--- a/Documentation/technical/racy-git.txt\n+++ b/Documentation/technical/racy-git.txt\n@@ -165,9 +165,9 @@ Avoiding runtime penalty\n \n In order to avoid the above runtime penalty, post 1.4.2 Git used\n to have a code that made sure the index file\n-got timestamp newer than the youngest files in the index when\n-there are many young files with the same timestamp as the\n-resulting index file would otherwise would have by waiting\n+got a timestamp newer than the youngest files in the index when\n+there were many young files with the same timestamp as the\n+resulting index file otherwise would have by waiting\n before finishing writing the index file out.\n \n I suspected that in practice the situation where many paths in the\ndiff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.txt\nindex 6a67cc4174f..d7d066d876a 100644\n--- a/Documentation/technical/reftable.txt\n+++ b/Documentation/technical/reftable.txt\n@@ -115,7 +115,7 @@ Varint encoding\n Varint encoding is identical to the ofs-delta encoding method used\n within pack files.\n \n-Decoder works such as:\n+Decoder works as follows:\n \n ....\n val = buf[ptr] & 0x7f\ndiff --git a/Documentation/urls.txt b/Documentation/urls.txt\nindex 1c229d75815..4e79c1589ec 100644\n--- a/Documentation/urls.txt\n+++ b/Documentation/urls.txt\n@@ -6,9 +6,9 @@ address of the remote server, and the path to the repository.\n Depending on the transport protocol, some of this information may be\n absent.\n \n-Git supports ssh, git, http, and https protocols (in addition, ftp,\n+Git supports ssh, git, http, and https protocols (in addition, ftp\n and ftps can be used for fetching, but this is inefficient and\n-deprecated; do not use it).\n+deprecated; do not use them).\n \n The native transport (i.e. git:// URL) does no authentication and\n should be used with caution on unsecured networks.\n-- \ngitgitgadget\n\n"},{"id":"482803","messageId":"2677abed19ecfcfb9c4ebf9613da24798da98ed3.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 14/25] documentation: fix choice of article","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:16Z","receivedAt":"2023-10-08T06:46:07Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config.txt | 2 +-\n Documentation/diff-generate-patch.txt | 2 +-\n Documentation/howto/maintain-git.txt | 2 +-\n Documentation/pretty-options.txt | 2 +-\n Documentation/technical/bitmap-format.txt | 2 +-\n 5 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 9273c7f1c65..99affec5a01 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -103,7 +103,7 @@ was found. See below for examples.\n Conditional includes\n ~~~~~~~~~~~~~~~~~~~~\n \n-You can conditionally include a config file from another by setting a\n+You can conditionally include a config file from another by setting an\n `includeIf..path` variable to the name of the file to be\n included.\n \ndiff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt\nindex 65e0b1646e1..4b307cb51bb 100644\n--- a/Documentation/diff-generate-patch.txt\n+++ b/Documentation/diff-generate-patch.txt\n@@ -156,7 +156,7 @@ format, `/dev/null` is used to signal created or deleted\n files.\n +\n However, if the --combined-all-paths option is provided, instead of a\n-two-line from-file/to-file you get a N+1 line from-file/to-file header,\n+two-line from-file/to-file you get an N+1 line from-file/to-file header,\n where N is the number of parents in the merge commit:\n \n --- a/file\ndiff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt\nindex 29c473e5e04..013014bbef6 100644\n--- a/Documentation/howto/maintain-git.txt\n+++ b/Documentation/howto/maintain-git.txt\n@@ -411,7 +411,7 @@ Preparing a \"merge-fix\"\n \n A merge of two topics may not textually conflict but still have\n conflict at the semantic level. A classic example is for one topic\n-to rename an variable and all its uses, while another topic adds a\n+to rename a variable and all its uses, while another topic adds a\n new use of the variable under its old name. When these two topics\n are merged together, the reference to the variable newly added by\n the latter topic will still use the old name in the result.\ndiff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt\nindex 335395b727f..15c6f2705d4 100644\n--- a/Documentation/pretty-options.txt\n+++ b/Documentation/pretty-options.txt\n@@ -73,7 +73,7 @@ environment overrides). See linkgit:git-config[1] for more details.\n With an optional '' argument, use the ref to find the notes\n to display. The ref can specify the full refname when it begins\n with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise\n-`refs/notes/` is prefixed to form a full name of the ref.\n+`refs/notes/` is prefixed to form the full name of the ref.\n +\n Multiple --notes options can be combined to control which notes are\n being displayed. Examples: \"--notes=foo\" will show only notes from\ndiff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.txt\nindex 687c58cebcc..f761828f106 100644\n--- a/Documentation/technical/bitmap-format.txt\n+++ b/Documentation/technical/bitmap-format.txt\n@@ -126,7 +126,7 @@ Each entry contains the following:\n \t** {empty}\n \t1-byte XOR-offset: ::\n \t The xor offset used to compress this bitmap. For an entry\n-\t in position `x`, a XOR offset of `y` means that the actual\n+\t in position `x`, an XOR offset of `y` means that the actual\n \t bitmap representing this commit is composed by XORing the\n \t bitmap for this entry with the bitmap in entry `x-y` (i.e.\n \t the bitmap `y` entries before this one).\n-- \ngitgitgadget\n\n"},{"id":"482806","messageId":"cf320e4f80fa7dc0ee37cee40b273ad6703c3a97.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 13/25] documentation: whitespace is already generally plural","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:15Z","receivedAt":"2023-10-08T06:46:09Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config/apply.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/config/apply.txt b/Documentation/config/apply.txt\nindex 3f9ff19db6b..f9908e210a8 100644\n--- a/Documentation/config/apply.txt\n+++ b/Documentation/config/apply.txt\n@@ -7,5 +7,5 @@ apply.ignoreWhitespace::\n \tSee linkgit:git-apply[1].\n \n apply.whitespace::\n-\tTells 'git apply' how to handle whitespaces, in the same way\n+\tTells 'git apply' how to handle whitespace, in the same way\n \tas the `--whitespace` option. See linkgit:git-apply[1].\n-- \ngitgitgadget\n\n"},{"id":"482805","messageId":"36251f19f736cf2004c325e2418d786acd1334bc.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 16/25] documentation: remove unnecessary hyphens","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:18Z","receivedAt":"2023-10-08T06:46:10Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/ReviewingGuidelines.txt | 2 +-\n Documentation/git-check-attr.txt | 2 +-\n Documentation/git-merge-base.txt | 2 +-\n 3 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/ReviewingGuidelines.txt b/Documentation/ReviewingGuidelines.txt\nindex 3e98c8a6af0..515d470d23c 100644\n--- a/Documentation/ReviewingGuidelines.txt\n+++ b/Documentation/ReviewingGuidelines.txt\n@@ -126,7 +126,7 @@ Terminology\n -----------\n nit: ::\n \tDenotes a small issue that should be fixed, such as a typographical error\n-\tor mis-alignment of conditions in an `if()` statement.\n+\tor misalignment of conditions in an `if()` statement.\n \n aside: ::\n optional: ::\ndiff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt\nindex 6e4f3aaf34c..7fea245ed22 100644\n--- a/Documentation/git-check-attr.txt\n+++ b/Documentation/git-check-attr.txt\n@@ -29,7 +29,7 @@ OPTIONS\n \n --stdin::\n \tRead pathnames from the standard input, one per line,\n-\tinstead of from the command-line.\n+\tinstead of from the command line.\n \n -z::\n \tThe output format is modified to be machine-parsable.\ndiff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt\nindex 463764b9c1e..5cdcb5663cd 100644\n--- a/Documentation/git-merge-base.txt\n+++ b/Documentation/git-merge-base.txt\n@@ -130,7 +130,7 @@ When the history involves criss-cross merges, there can be more than one\n ---2---o---o---B\n ....\n \n-both '1' and '2' are merge-bases of A and B. Neither one is better than\n+both '1' and '2' are merge bases of A and B. Neither one is better than\n the other (both are 'best' merge bases). When the `--all` option is not given,\n it is unspecified which best one is output.\n \n-- \ngitgitgadget\n\n"},{"id":"482807","messageId":"db943adfe9442c5e33a91fa59f572f8638e49fe3.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 17/25] documentation: add missing hyphens","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:19Z","receivedAt":"2023-10-08T06:46:12Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config.txt | 2 +-\n Documentation/config/pack.txt | 2 +-\n Documentation/config/status.txt | 2 +-\n 3 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 99affec5a01..b1dba1ae853 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -118,7 +118,7 @@ are:\n \tpattern, the include condition is met.\n +\n The .git location may be auto-discovered, or come from `$GIT_DIR`\n-environment variable. If the repository is auto discovered via a .git\n+environment variable. If the repository is auto-discovered via a .git\n file (e.g. from submodules, or a linked worktree), the .git location\n would be the final location where the .git directory is, not where the\n .git file is.\ndiff --git a/Documentation/config/pack.txt b/Documentation/config/pack.txt\nindex 6308f21e03d..f50df9dbce8 100644\n--- a/Documentation/config/pack.txt\n+++ b/Documentation/config/pack.txt\n@@ -87,7 +87,7 @@ pack.indexVersion::\n \tlarger than 2 GB.\n +\n If you have an old Git that does not understand the version 2 `*.idx` file,\n-cloning or fetching over a non native protocol (e.g. \"http\")\n+cloning or fetching over a non-native protocol (e.g. \"http\")\n that will copy both `*.pack` file and corresponding `*.idx` file from the\n other side may give you a repository that cannot be accessed with your\n older version of Git. If the `*.pack` file is smaller than 2 GB, however,\ndiff --git a/Documentation/config/status.txt b/Documentation/config/status.txt\nindex f0336938cbc..2ff8237f8fc 100644\n--- a/Documentation/config/status.txt\n+++ b/Documentation/config/status.txt\n@@ -62,7 +62,7 @@ of linkgit:git-status[1] and linkgit:git-commit[1].\n \n status.submoduleSummary::\n \tDefaults to false.\n-\tIf this is set to a non zero number or true (identical to -1 or an\n+\tIf this is set to a non-zero number or true (identical to -1 or an\n \tunlimited number), the submodule summary will be enabled and a\n \tsummary of commits for modified submodules will be shown (see\n \t--summary-limit option of linkgit:git-submodule[1]). Please note\n-- \ngitgitgadget\n\n"},{"id":"482808","messageId":"a5fc283bab4864d024ad351e9029dcfc8353eaa1.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 12/25] documentation: fix singular vs. plural","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:14Z","receivedAt":"2023-10-08T06:46:46Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/ToolsForGit.txt | 2 +-\n Documentation/config/advice.txt | 2 +-\n Documentation/config/column.txt | 2 +-\n Documentation/config/diff.txt | 2 +-\n Documentation/config/fetch.txt | 2 +-\n Documentation/config/mailinfo.txt | 2 +-\n Documentation/config/rerere.txt | 2 +-\n Documentation/config/user.txt | 2 +-\n Documentation/config/versionsort.txt | 4 ++--\n Documentation/diff-generate-patch.txt | 2 +-\n Documentation/git-am.txt | 2 +-\n Documentation/git-merge-tree.txt | 6 +++---\n Documentation/git-repack.txt | 2 +-\n Documentation/git-replace.txt | 2 +-\n Documentation/git-send-pack.txt | 4 ++--\n Documentation/git-show-branch.txt | 2 +-\n Documentation/git-show.txt | 2 +-\n Documentation/git-update-index.txt | 6 +++---\n Documentation/git-whatchanged.txt | 2 +-\n Documentation/gitcli.txt | 2 +-\n Documentation/gitdiffcore.txt | 2 +-\n Documentation/giteveryday.txt | 2 +-\n Documentation/githooks.txt | 4 ++--\n Documentation/gitsubmodules.txt | 2 +-\n Documentation/mergetools/vimdiff.txt | 2 +-\n Documentation/technical/api-index-skel.txt | 2 +-\n Documentation/technical/racy-git.txt | 2 +-\n Documentation/technical/repository-version.txt | 2 +-\n Documentation/urls-remotes.txt | 2 +-\n 29 files changed, 36 insertions(+), 36 deletions(-)\n\ndiff --git a/Documentation/ToolsForGit.txt b/Documentation/ToolsForGit.txt\nindex 5d01e8191aa..209eaad31ea 100644\n--- a/Documentation/ToolsForGit.txt\n+++ b/Documentation/ToolsForGit.txt\n@@ -5,7 +5,7 @@ Tools for developing Git\n [[summary]]\n == Summary\n \n-This document gathers tips, scripts and configuration file to help people\n+This document gathers tips, scripts and configuration files to help people\n working on Git's codebase use their favorite tools while following Git's\n coding style.\n \ndiff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt\nindex c8e38a0e5cd..c5cde1c24ee 100644\n--- a/Documentation/config/advice.txt\n+++ b/Documentation/config/advice.txt\n@@ -63,7 +63,7 @@ advice.*::\n \t\tthe template shown when writing commit messages in\n \t\tlinkgit:git-commit[1], and in the help message shown\n \t\tby linkgit:git-switch[1] or\n-\t\tlinkgit:git-checkout[1] when switching branch.\n+\t\tlinkgit:git-checkout[1] when switching branches.\n \tstatusUoption::\n \t\tAdvise to consider using the `-u` option to linkgit:git-status[1]\n \t\twhen the command takes more than 2 seconds to enumerate untracked\ndiff --git a/Documentation/config/column.txt b/Documentation/config/column.txt\nindex 9f30322362d..01e4198429e 100644\n--- a/Documentation/config/column.txt\n+++ b/Documentation/config/column.txt\n@@ -51,5 +51,5 @@ column.status::\n \tSee `column.ui` for details.\n \n column.tag::\n-\tSpecify whether to output tag listing in `git tag` in columns.\n+\tSpecify whether to output tag listings in `git tag` in columns.\n \tSee `column.ui` for details.\ndiff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt\nindex 9391c77e552..bd5ae0c3378 100644\n--- a/Documentation/config/diff.txt\n+++ b/Documentation/config/diff.txt\n@@ -1,6 +1,6 @@\n diff.autoRefreshIndex::\n \tWhen using 'git diff' to compare with work tree\n-\tfiles, do not consider stat-only change as changed.\n+\tfiles, do not consider stat-only changes as changed.\n \tInstead, silently run `git update-index --refresh` to\n \tupdate the cached stat information for paths whose\n \tcontents in the work tree match the contents in the\ndiff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt\nindex c1a7cdd6bf4..aea5b97477b 100644\n--- a/Documentation/config/fetch.txt\n+++ b/Documentation/config/fetch.txt\n@@ -53,7 +53,7 @@ fetch.pruneTags::\n fetch.output::\n \tControl how ref update status is printed. Valid values are\n \t`full` and `compact`. Default value is `full`. See the\n-\tOUTPUT section in linkgit:git-fetch[1] for detail.\n+\tOUTPUT section in linkgit:git-fetch[1] for details.\n \n fetch.negotiationAlgorithm::\n \tControl how information about the commits in the local repository\ndiff --git a/Documentation/config/mailinfo.txt b/Documentation/config/mailinfo.txt\nindex 3854d4ae37c..ec3a5d81f72 100644\n--- a/Documentation/config/mailinfo.txt\n+++ b/Documentation/config/mailinfo.txt\n@@ -1,6 +1,6 @@\n mailinfo.scissors::\n \tIf true, makes linkgit:git-mailinfo[1] (and therefore\n \tlinkgit:git-am[1]) act by default as if the --scissors option\n-\twas provided on the command-line. When active, this features\n+\twas provided on the command-line. When active, this feature\n \tremoves everything from the message body before a scissors\n \tline (i.e. consisting mainly of \">8\", \"8<\" and \"-\").\ndiff --git a/Documentation/config/rerere.txt b/Documentation/config/rerere.txt\nindex 40abdf6a6b5..3a78b5ebb1d 100644\n--- a/Documentation/config/rerere.txt\n+++ b/Documentation/config/rerere.txt\n@@ -1,7 +1,7 @@\n rerere.autoUpdate::\n \tWhen set to true, `git-rerere` updates the index with the\n \tresulting contents after it cleanly resolves conflicts using\n-\tpreviously recorded resolution. Defaults to false.\n+\tpreviously recorded resolutions. Defaults to false.\n \n rerere.enabled::\n \tActivate recording of resolved conflicts, so that identical\ndiff --git a/Documentation/config/user.txt b/Documentation/config/user.txt\nindex 958e62464a5..2bbc8e929f0 100644\n--- a/Documentation/config/user.txt\n+++ b/Documentation/config/user.txt\n@@ -5,7 +5,7 @@ author.email::\n committer.name::\n committer.email::\n \tThe `user.name` and `user.email` variables determine what ends\n-\tup in the `author` and `committer` field of commit\n+\tup in the `author` and `committer` fields of commit\n \tobjects.\n \tIf you need the `author` or `committer` to be different, the\n \t`author.name`, `author.email`, `committer.name` or\ndiff --git a/Documentation/config/versionsort.txt b/Documentation/config/versionsort.txt\nindex 6c7cc054fad..0d66617f59f 100644\n--- a/Documentation/config/versionsort.txt\n+++ b/Documentation/config/versionsort.txt\n@@ -24,9 +24,9 @@ among those other suffixes. E.g. if the suffixes \"-rc\", \"\", \"-ck\" and\n are listed first, followed by \"v4.8\", then \"v4.8-ckX\" and finally\n \"v4.8-bfsX\".\n +\n-If more than one suffixes match the same tagname, then that tagname will\n+If more than one suffix matches the same tagname, then that tagname will\n be sorted according to the suffix which starts at the earliest position in\n-the tagname. If more than one different matching suffixes start at\n+the tagname. If more than one different matching suffix starts at\n that earliest position, then that tagname will be sorted according to the\n longest of those suffixes.\n The sorting order between different suffixes is undefined if they are\ndiff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt\nindex 49ad31fca2a..65e0b1646e1 100644\n--- a/Documentation/diff-generate-patch.txt\n+++ b/Documentation/diff-generate-patch.txt\n@@ -142,7 +142,7 @@ or like this (when the `--cc` option is used):\n +\n The `mode ,..` line appears only if at least one of\n the is different from the rest. Extended headers with\n-information about detected contents movement (renames and\n+information about detected content movement (renames and\n copying detection) are designed to work with diff of two\n and are not used by combined diff format.\n \ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 900be198b14..51c26715159 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -22,7 +22,7 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Splits mail messages in a mailbox into commit log message,\n+Splits mail messages in a mailbox into commit log messages,\n authorship information and patches, and applies them to the\n current branch. You could think of it as a reverse operation\n of linkgit:git-format-patch[1] run on a branch with a straight\ndiff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt\nindex ffc4fbf7e89..9f951c7fe34 100644\n--- a/Documentation/git-merge-tree.txt\n+++ b/Documentation/git-merge-tree.txt\n@@ -24,7 +24,7 @@ this documentation describes modern `--write-tree` mode.\n Performs a merge, but does not make any new commits and does not read\n from or write to either the working tree or index.\n \n-The performed merge will use the same feature as the \"real\"\n+The performed merge will use the same features as the \"real\"\n linkgit:git-merge[1], including:\n \n * three way content merges of individual files\n@@ -253,7 +253,7 @@ Do NOT attempt to guess or make the user guess the conflict types from\n the <> list. The information there is\n insufficient to do so. For example: Rename/rename(1to2) conflicts (both\n sides renamed the same file differently) will result in three different\n-file having higher order stages (but each only has one higher order\n+files having higher order stages (but each only has one higher order\n stage), with no way (short of the <> section)\n to determine which three files are related. File/directory conflicts\n also result in a file with exactly one higher order stage.\n@@ -263,7 +263,7 @@ a file with exactly one higher order stage. In all cases, the\n <> section has the necessary info, though it\n is not designed to be machine parseable.\n \n-Do NOT assume that each paths from <>, and\n+Do NOT assume that each path from <>, and\n the logical conflicts in the <> have a\n one-to-one mapping, nor that there is a one-to-many mapping, nor a\n many-to-one mapping. Many-to-many mappings exist, meaning that each\ndiff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt\nindex cbc0ece61e3..882ec056a3c 100644\n--- a/Documentation/git-repack.txt\n+++ b/Documentation/git-repack.txt\n@@ -207,7 +207,7 @@ When `--unpacked` is specified, loose objects are implicitly included in\n this \"roll-up\", without respect to their reachability. This is subject\n to change in the future. This option (implying a drastically different\n repack mode) is not guaranteed to work with all other combinations of\n-option to `git repack`.\n+options to `git repack`.\n +\n When writing a multi-pack bitmap, `git repack` selects the largest resulting\n pack as the preferred pack for object selection by the MIDX (see\ndiff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt\nindex f271d758c38..fdd2e0f0883 100644\n--- a/Documentation/git-replace.txt\n+++ b/Documentation/git-replace.txt\n@@ -111,7 +111,7 @@ OPTIONS\n FORMATS\n -------\n \n-The following format are available:\n+The following formats are available:\n \n * 'short':\n \t\ndiff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt\nindex e76c262d7f9..9c1ed757b9d 100644\n--- a/Documentation/git-send-pack.txt\n+++ b/Documentation/git-send-pack.txt\n@@ -115,7 +115,7 @@ both on the local side and on the remote side are updated.\n \n When one or more '' are specified explicitly (whether on the\n command line or via `--stdin`), it can be either a\n-single pattern, or a pair of such pattern separated by a colon\n+single pattern, or a pair of such patterns separated by a colon\n \":\" (this means that a ref name cannot have a colon in it). A\n single pattern '' is just shorthand for ':'.\n \n@@ -130,7 +130,7 @@ name. See linkgit:git-rev-parse[1].\n - It is an error if does not match exactly one of the\n local refs.\n \n- - It is an error if matches more than one remote refs.\n+ - It is an error if matches more than one remote ref.\n \n - If does not match any remote ref, either\n \ndiff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\nindex 58cf6210cde..080b5246a4e 100644\n--- a/Documentation/git-show-branch.txt\n+++ b/Documentation/git-show-branch.txt\n@@ -154,7 +154,7 @@ $ git show-branch master fixes mhf\n ! [mhf] Allow \"+remote:local\" refspec to cause --force when fetching.\n ---\n + [mhf] Allow \"+remote:local\" refspec to cause --force when fetching.\n- + [mhf~1] Use git-octopus when pulling more than one heads.\n+ + [mhf~1] Use git-octopus when pulling more than one head.\n + [fixes] Introduce \"reset type\" flag to \"git reset\"\n + [mhf~2] \"git fetch --force\".\n + [mhf~3] Use .git/remote/origin, not .git/branches/origin.\ndiff --git a/Documentation/git-show.txt b/Documentation/git-show.txt\nindex 03c06345186..5eb67439aff 100644\n--- a/Documentation/git-show.txt\n+++ b/Documentation/git-show.txt\n@@ -61,7 +61,7 @@ EXAMPLES\n --------\n \n `git show v1.0.0`::\n-\tShows the tag `v1.0.0`, along with the object the tags\n+\tShows the tag `v1.0.0`, along with the object the tag\n \tpoints at.\n \n `git show v1.0.0^{tree}`::\ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\nindex 1271486ae9c..7f0c950a5fd 100644\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -49,7 +49,7 @@ OPTIONS\n --remove::\n \tIf a specified file is in the index but is missing then it's\n \tremoved.\n-\tDefault behavior is to ignore removed file.\n+\tDefault behavior is to ignore removed files.\n \n --refresh::\n \tLooks at the current index and checks to see if merges or\n@@ -108,7 +108,7 @@ you will need to handle the situation manually.\n \twithout regard to the \"assume unchanged\" setting.\n \n --[no-]skip-worktree::\n-\tWhen one of these flags is specified, the object name recorded\n+\tWhen one of these flags is specified, the object names recorded\n \tfor the paths are not updated. Instead, these options\n \tset and unset the \"skip-worktree\" bit for the paths. See\n \tsection \"Skip-worktree bit\" below for more information.\n@@ -119,7 +119,7 @@ you will need to handle the situation manually.\n \tthe `--remove` option was specified.\n \n --[no-]fsmonitor-valid::\n-\tWhen one of these flags is specified, the object name recorded\n+\tWhen one of these flags is specified, the object names recorded\n \tfor the paths are not updated. Instead, these options\n \tset and unset the \"fsmonitor valid\" bit for the paths. See\n \tsection \"File System Monitor\" below for more information.\ndiff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt\nindex ee8c1aa0ca4..fc2dc5a3b1d 100644\n--- a/Documentation/git-whatchanged.txt\n+++ b/Documentation/git-whatchanged.txt\n@@ -3,7 +3,7 @@ git-whatchanged(1)\n \n NAME\n ----\n-git-whatchanged - Show logs with difference each commit introduces\n+git-whatchanged - Show logs with differences each commit introduces\n \n \n SYNOPSIS\ndiff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt\nindex f0986881bac..71ffe5556ae 100644\n--- a/Documentation/gitcli.txt\n+++ b/Documentation/gitcli.txt\n@@ -26,7 +26,7 @@ arguments. Here are the rules:\n accept dashed options after you have already given non-option\n arguments (which may make the command ambiguous), but you should\n not rely on it (because eventually we may find a way to fix\n- these ambiguity by enforcing the \"options then args\" rule).\n+ these ambiguities by enforcing the \"options then args\" rule).\n \n * Revisions come first and then paths.\n E.g. in `git diff v1.0 v2.0 arch/x86 include/asm-x86`,\ndiff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt\nindex 5681ba3f330..411ce863598 100644\n--- a/Documentation/gitdiffcore.txt\n+++ b/Documentation/gitdiffcore.txt\n@@ -230,7 +230,7 @@ like these:\n \n * -B/60 (the same as above, since diffcore-break defaults to 50%).\n \n-Note that earlier implementation left a broken pair as a separate\n+Note that earlier implementation left a broken pair as separate\n creation and deletion patches. This was an unnecessary hack and\n the latest implementation always merges all the broken pairs\n back into modifications, but the resulting patch output is\ndiff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt\nindex faba2ef0881..12b62b91256 100644\n--- a/Documentation/giteveryday.txt\n+++ b/Documentation/giteveryday.txt\n@@ -14,7 +14,7 @@ DESCRIPTION\n -----------\n \n Git users can broadly be grouped into four categories for the purposes of\n-describing here a small set of useful command for everyday Git.\n+describing here a small set of useful commands for everyday Git.\n \n *\t<> commands are essential\n \tfor anybody who makes a commit, even for somebody who works alone.\ndiff --git a/Documentation/githooks.txt b/Documentation/githooks.txt\nindex 34e2c656de3..e62ad343eda 100644\n--- a/Documentation/githooks.txt\n+++ b/Documentation/githooks.txt\n@@ -80,7 +80,7 @@ If it exits with non-zero status, then the working tree will not be\n committed after applying the patch.\n \n It can be used to inspect the current working tree and refuse to\n-make a commit if it does not pass certain test.\n+make a commit if it does not pass certain tests.\n \n The default 'pre-applypatch' hook, when enabled, runs the\n 'pre-commit' hook, if the latter is enabled.\n@@ -379,7 +379,7 @@ following example for the protocol, the letter 'S' stands for\n S: ... ...\n S: flush-pkt\n \n- # Receive result from the hook.\n+ # Receive results from the hook.\n # OK, run this command successfully.\n H: PKT-LINE(ok )\n # NO, I reject it.\ndiff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt\nindex 13678ead045..8400d591da0 100644\n--- a/Documentation/gitsubmodules.txt\n+++ b/Documentation/gitsubmodules.txt\n@@ -192,7 +192,7 @@ For example:\n [submodule \"baz\"]\n url = https://example.org/baz\n \n-In the above config only the submodule 'bar' and 'baz' are active,\n+In the above config only the submodules 'bar' and 'baz' are active,\n 'bar' due to (1) and 'baz' due to (3). 'foo' is inactive because\n (1) takes precedence over (3)\n \ndiff --git a/Documentation/mergetools/vimdiff.txt b/Documentation/mergetools/vimdiff.txt\nindex c36c5479392..d1a4c468e63 100644\n--- a/Documentation/mergetools/vimdiff.txt\n+++ b/Documentation/mergetools/vimdiff.txt\n@@ -162,7 +162,7 @@ information as the first tab, with a different layout.\n | REMOTE | |\n ---------------------------------------------\n ....\n-Note how in the third tab definition we need to use parenthesis to make `,`\n+Note how in the third tab definition we need to use parentheses to make `,`\n have precedence over `/`.\n --\n \ndiff --git a/Documentation/technical/api-index-skel.txt b/Documentation/technical/api-index-skel.txt\nindex eda8c195c19..7780a76b080 100644\n--- a/Documentation/technical/api-index-skel.txt\n+++ b/Documentation/technical/api-index-skel.txt\n@@ -1,7 +1,7 @@\n Git API Documents\n =================\n \n-Git has grown a set of internal API over time. This collection\n+Git has grown a set of internal APIs over time. This collection\n documents them.\n \n ////////////////////////////////////////////////////////////////\ndiff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt\nindex 02ae508d227..59bea66c0fc 100644\n--- a/Documentation/technical/racy-git.txt\n+++ b/Documentation/technical/racy-git.txt\n@@ -190,7 +190,7 @@ In a large project where raciness avoidance cost really matters,\n however, the initial computation of all object names in the\n index takes more than one second, and the index file is written\n out after all that happens. Therefore the timestamp of the\n-index file will be more than one seconds later than the\n+index file will be more than one second later than the\n youngest file in the working tree. This means that in these\n cases there actually will not be any racily clean entry in\n the resulting index.\ndiff --git a/Documentation/technical/repository-version.txt b/Documentation/technical/repository-version.txt\nindex 8ef664b0b95..045a76756fc 100644\n--- a/Documentation/technical/repository-version.txt\n+++ b/Documentation/technical/repository-version.txt\n@@ -96,7 +96,7 @@ The value of this key is the name of the promisor remote.\n ==== `worktreeConfig`\n \n If set, by default \"git config\" reads from both \"config\" and\n-\"config.worktree\" file from GIT_DIR in that order. In\n+\"config.worktree\" files from GIT_DIR in that order. In\n multiple working directory mode, \"config\" file is shared while\n \"config.worktree\" is per-working directory (i.e., it's in\n GIT_COMMON_DIR/worktrees//config.worktree)\ndiff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt\nindex 3504afbf2e9..bf170122415 100644\n--- a/Documentation/urls-remotes.txt\n+++ b/Documentation/urls-remotes.txt\n@@ -48,7 +48,7 @@ provide a refspec on the command line. This file should have the\n following format:\n \n ------------\n-\tURL: one of the above URL format\n+\tURL: one of the above URL formats\n \tPush: \n \tPull: \n \n-- \ngitgitgadget\n\n"},{"id":"482809","messageId":"067474826a76d1db15570cc410a9d251cfe973dd.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 18/25] documentation: use clearer prepositions","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:20Z","receivedAt":"2023-10-08T06:46:48Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/SubmittingPatches | 2 +-\n Documentation/config/branch.txt | 2 +-\n Documentation/config/i18n.txt | 2 +-\n Documentation/diff-generate-patch.txt | 4 ++--\n Documentation/git-am.txt | 2 +-\n Documentation/git-diff-files.txt | 2 +-\n Documentation/git-fsmonitor--daemon.txt | 2 +-\n Documentation/git-hook.txt | 2 +-\n Documentation/git-merge-base.txt | 4 ++--\n Documentation/git-mergetool.txt | 2 +-\n Documentation/git-request-pull.txt | 2 +-\n Documentation/git-rev-parse.txt | 2 +-\n Documentation/git-show-branch.txt | 4 ++--\n Documentation/git-update-index.txt | 2 +-\n 14 files changed, 17 insertions(+), 17 deletions(-)\n\ndiff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches\nindex 973d7a81d44..0e2d3fbb9cc 100644\n--- a/Documentation/SubmittingPatches\n+++ b/Documentation/SubmittingPatches\n@@ -87,7 +87,7 @@ maintainer.\n Under truly exceptional circumstances where you absolutely must depend\n on a select few topic branches that are already in `next` but not in\n `master`, you may want to create your own custom base-branch by forking\n-`master` and merging the required topic branches to it. You could then\n+`master` and merging the required topic branches into it. You could then\n work on top of this base-branch. But keep in mind that this base-branch\n would only be known privately to you. So when you are ready to send\n your patches to the list, be sure to communicate how you created it in\ndiff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt\nindex 3bec6daf71a..432b9cd2c0e 100644\n--- a/Documentation/config/branch.txt\n+++ b/Documentation/config/branch.txt\n@@ -99,5 +99,5 @@ for details).\n branch..description::\n \tBranch description, can be edited with\n \t`git branch --edit-description`. Branch description is\n-\tautomatically added in the format-patch cover letter or\n+\tautomatically added to the format-patch cover letter or\n \trequest-pull summary.\ndiff --git a/Documentation/config/i18n.txt b/Documentation/config/i18n.txt\nindex cc256217317..6e72fdb45bd 100644\n--- a/Documentation/config/i18n.txt\n+++ b/Documentation/config/i18n.txt\n@@ -2,7 +2,7 @@ i18n.commitEncoding::\n \tCharacter encoding the commit messages are stored in; Git itself\n \tdoes not care per se, but this information is necessary e.g. when\n \timporting commits from emails or in the gitk graphical history\n-\tbrowser (and possibly at other places in the future or in other\n+\tbrowser (and possibly in other places in the future or in other\n \tporcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'.\n \n i18n.logOutputEncoding::\ndiff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt\nindex cf1958ca632..988e33de70b 100644\n--- a/Documentation/diff-generate-patch.txt\n+++ b/Documentation/diff-generate-patch.txt\n@@ -17,7 +17,7 @@ You can customize the creation of patch text via the\n What the -p option produces is slightly different from the traditional\n diff format:\n \n-1. It is preceded with a \"git diff\" header that looks like this:\n+1. It is preceded by a \"git diff\" header that looks like this:\n \n diff --git a/file1 b/file2\n +\n@@ -123,7 +123,7 @@ index fabadb8,cc95eb0..4866510\n \t\tfor_each_ref(get_name);\n ------------\n \n-1. It is preceded with a \"git diff\" header, that looks like\n+1. It is preceded by a \"git diff\" header, that looks like\n this (when the `-c` option is used):\n \n diff --combined file\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 00a5ec206d6..2ada047b6aa 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -69,7 +69,7 @@ OPTIONS\n --empty=(stop|drop|keep)::\n \tBy default, or when the option is set to 'stop', the command\n \terrors out on an input e-mail message lacking a patch\n-\tand stops into the middle of the current am session. When this\n+\tand stops in the middle of the current am session. When this\n \toption is set to 'drop', skip such an e-mail message instead.\n \tWhen this option is set to 'keep', create an empty commit,\n \trecording the contents of the e-mail message as its log.\ndiff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt\nindex 591e3801b7b..18f7f86bef3 100644\n--- a/Documentation/git-diff-files.txt\n+++ b/Documentation/git-diff-files.txt\n@@ -42,7 +42,7 @@ omit diff output for unmerged entries and just show \"Unmerged\".\n \tcommit with these flags.\n \n -q::\n-\tRemain silent even on nonexistent files\n+\tRemain silent even for nonexistent files\n \n \n include::diff-format.txt[]\ndiff --git a/Documentation/git-fsmonitor--daemon.txt b/Documentation/git-fsmonitor--daemon.txt\nindex f50a28b09f9..324299bfe9b 100644\n--- a/Documentation/git-fsmonitor--daemon.txt\n+++ b/Documentation/git-fsmonitor--daemon.txt\n@@ -70,7 +70,7 @@ the change (as happening against the super repo). However, the client\n will properly ignore these extra events, so performance may be affected\n but it will not cause an incorrect result.\n \n-By default, the fsmonitor daemon refuses to work against network-mounted\n+By default, the fsmonitor daemon refuses to work with network-mounted\n repositories; this may be overridden by setting `fsmonitor.allowRemote` to\n `true`. Note, however, that the fsmonitor daemon is not guaranteed to work\n correctly with all network-mounted repositories and such use is considered\ndiff --git a/Documentation/git-hook.txt b/Documentation/git-hook.txt\nindex 3407f3c2c07..25237330b5c 100644\n--- a/Documentation/git-hook.txt\n+++ b/Documentation/git-hook.txt\n@@ -13,7 +13,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n \n-A command interface to running git hooks (see linkgit:githooks[5]),\n+A command interface for running git hooks (see linkgit:githooks[5]),\n for use by other scripted git commands.\n \n SUBCOMMANDS\ndiff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt\nindex 5cdcb5663cd..cbc77f72588 100644\n--- a/Documentation/git-merge-base.txt\n+++ b/Documentation/git-merge-base.txt\n@@ -28,7 +28,7 @@ merge base for a pair of commits.\n OPERATION MODES\n ---------------\n \n-As the most common special case, specifying only two commits on the\n+In the most common special case, specifying only two commits on the\n command line means computing the merge base between the given two commits.\n \n More generally, among the two commits to compute the merge base from,\n@@ -64,7 +64,7 @@ from linkgit:git-show-branch[1] when used with the `--merge-base` option.\n \tthe two commits, but also takes into account the reflog of\n \t to see if the history leading to forked from\n \tan earlier incarnation of the branch (see discussion\n-\ton this mode below).\n+\tof this mode below).\n \n OPTIONS\n -------\ndiff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt\nindex 800a3cbe6f3..7b7b6f8f344 100644\n--- a/Documentation/git-mergetool.txt\n+++ b/Documentation/git-mergetool.txt\n@@ -17,7 +17,7 @@ Use `git mergetool` to run one of several merge utilities to resolve\n merge conflicts. It is typically run after 'git merge'.\n \n If one or more parameters are given, the merge tool program will\n-be run to resolve differences on each file (skipping those without\n+be run to resolve differences in each file (skipping those without\n conflicts). Specifying a directory will include all unresolved files in\n that path. If no names are specified, 'git mergetool' will run\n the merge tool program on every file with merge conflicts.\ndiff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.txt\nindex fa5a4267092..d274002666c 100644\n--- a/Documentation/git-request-pull.txt\n+++ b/Documentation/git-request-pull.txt\n@@ -50,7 +50,7 @@ EXAMPLES\n --------\n \n Imagine that you built your work on your `master` branch on top of\n-the `v1.0` release, and want it to be integrated to the project.\n+the `v1.0` release, and want it to be integrated into the project.\n First you push that change to your public repository for others to\n see:\n \ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex f42fb938705..912fab9f5e0 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -383,7 +383,7 @@ Each line of options has this format:\n \tdash to separate words in a multi-word argument hint.\n \n The remainder of the line, after stripping the spaces, is used\n-as the help associated to the option.\n+as the help associated with the option.\n \n Blank lines are ignored, and lines that don't match this specification are used\n as option group headers (start the line with a space to create such\ndiff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\nindex ddf24aeb87d..4ef0872b463 100644\n--- a/Documentation/git-show-branch.txt\n+++ b/Documentation/git-show-branch.txt\n@@ -50,7 +50,7 @@ OPTIONS\n \n --current::\n \tWith this option, the command includes the current\n-\tbranch to the list of revs to be shown when it is not\n+\tbranch in the list of revs to be shown when it is not\n \tgiven on the command line.\n \n --topo-order::\n@@ -197,7 +197,7 @@ $ git show-branch --reflog=\"10,1 hour ago\" --list master\n \n shows 10 reflog entries going back from the tip as of 1 hour ago.\n Without `--list`, the output also shows how these tips are\n-topologically related with each other.\n+topologically related to each other.\n \n CONFIGURATION\n -------------\ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\nindex 7ac2e37c0ac..e030dd75bed 100644\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -127,7 +127,7 @@ you will need to handle the situation manually.\n -g::\n --again::\n \tRuns 'git update-index' itself on the paths whose index\n-\tentries are different from those from the `HEAD` commit.\n+\tentries are different from those of the `HEAD` commit.\n \n --unresolve::\n \tRestores the 'unmerged' or 'needs updating' state of a\n-- \ngitgitgadget\n\n"},{"id":"482810","messageId":"6d3142f9672aec59b673741c569dac361f809a5e.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 21/25] documentation: fix whitespace issues","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:23Z","receivedAt":"2023-10-08T06:46:50Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nGet rid of extraneous whitespace, replace tab-after-fullstop with\nspace, etc.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/git-blame.txt | 2 +-\n Documentation/git-check-ignore.txt | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt\nindex 6f39147c051..5720d04ffe4 100644\n--- a/Documentation/git-blame.txt\n+++ b/Documentation/git-blame.txt\n@@ -170,7 +170,7 @@ which limits the annotation to the body of the `hello` subroutine.\n \n When you are not interested in changes older than version\n v2.6.18, or changes older than 3 weeks, you can use revision\n-range specifiers similar to 'git rev-list':\n+range specifiers similar to 'git rev-list':\n \n \tgit blame v2.6.18.. -- foo\n \tgit blame --since=3.weeks -- foo\ndiff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt\nindex 2892799e32f..3e3b4e34462 100644\n--- a/Documentation/git-check-ignore.txt\n+++ b/Documentation/git-check-ignore.txt\n@@ -50,7 +50,7 @@ linkgit:gitignore[5].\n \twith a NUL character instead of a linefeed character.\n \n -n, --non-matching::\n-\tShow given paths which don't match any pattern.\t This only\n+\tShow given paths which don't match any pattern. This only\n \tmakes sense when `--verbose` is enabled, otherwise it would\n \tnot be possible to distinguish between paths which match a\n \tpattern and those which don't.\n-- \ngitgitgadget\n\n"},{"id":"482811","messageId":"aea6805028bc6b4f96e8bbc579d61ea359e389ed.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 19/25] documentation: fix punctuation","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:21Z","receivedAt":"2023-10-08T06:46:53Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config/format.txt | 2 +-\n Documentation/config/fsck.txt | 2 +-\n Documentation/git-fsmonitor--daemon.txt | 2 +-\n Documentation/git-init.txt | 2 +-\n Documentation/git-ls-files.txt | 4 ++--\n 5 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/config/format.txt b/Documentation/config/format.txt\nindex 8cf6f00d936..c98412b697e 100644\n--- a/Documentation/config/format.txt\n+++ b/Documentation/config/format.txt\n@@ -68,7 +68,7 @@ format.encodeEmailHeaders::\n \tDefaults to true.\n \n format.pretty::\n-\tThe default pretty format for log/show/whatchanged command,\n+\tThe default pretty format for log/show/whatchanged command.\n \tSee linkgit:git-log[1], linkgit:git-show[1],\n \tlinkgit:git-whatchanged[1].\n \ndiff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt\nindex 57114161063..2384c8c94d6 100644\n--- a/Documentation/config/fsck.txt\n+++ b/Documentation/config/fsck.txt\n@@ -62,7 +62,7 @@ uniformly configure the same fsck settings in different circumstances\n all three of them must be set to the same values.\n +\n Older versions of Git (before 2.20) documented that the object names\n-list should be sorted. This was never a requirement, the object names\n+list should be sorted. This was never a requirement; the object names\n could appear in any order, but when reading the list we tracked whether\n the list was sorted for the purposes of an internal binary search\n implementation, which could save itself some work with an already sorted\ndiff --git a/Documentation/git-fsmonitor--daemon.txt b/Documentation/git-fsmonitor--daemon.txt\nindex 324299bfe9b..65c7b4641e8 100644\n--- a/Documentation/git-fsmonitor--daemon.txt\n+++ b/Documentation/git-fsmonitor--daemon.txt\n@@ -83,7 +83,7 @@ but not on network-mounted filesystems, NTFS, or FAT32. Other filesystems\n may or may not have the needed support; the fsmonitor daemon is not guaranteed\n to work with these filesystems and such use is considered experimental.\n \n-By default, the socket is created in the `.git` directory, however, if the\n+By default, the socket is created in the `.git` directory. However, if the\n `.git` directory is on a network-mounted filesystem, it will instead be\n created at `$HOME/.git-fsmonitor-*` unless `$HOME` itself is on a\n network-mounted filesystem in which case you must set the configuration\ndiff --git a/Documentation/git-init.txt b/Documentation/git-init.txt\nindex 3c3c1e730c3..6f0d2973bf4 100644\n--- a/Documentation/git-init.txt\n+++ b/Documentation/git-init.txt\n@@ -29,7 +29,7 @@ to use instead of `./.git` for the base of the repository.\n \n If the object storage directory is specified via the\n `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories\n-are created underneath - otherwise the default `$GIT_DIR/objects`\n+are created underneath; otherwise, the default `$GIT_DIR/objects`\n directory is used.\n \n Running 'git init' in an existing repository is safe. It will not\ndiff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt\nindex 60d1cca1496..f65a8cd91d4 100644\n--- a/Documentation/git-ls-files.txt\n+++ b/Documentation/git-ls-files.txt\n@@ -62,7 +62,7 @@ OPTIONS\n \tmatching an exclude pattern. When showing \"other\" files\n \t(i.e. when used with '-o'), show only those matched by an\n \texclude pattern. Standard ignore rules are not automatically\n-\tactivated, therefore at least one of the `--exclude*` options\n+\tactivated; therefore, at least one of the `--exclude*` options\n \tis required.\n \n -s::\n@@ -141,7 +141,7 @@ OPTIONS\n \tShow status tags together with filenames. Note that for\n \tscripting purposes, linkgit:git-status[1] `--porcelain` and\n \tlinkgit:git-diff-files[1] `--name-status` are almost always\n-\tsuperior alternatives, and users should look at\n+\tsuperior alternatives; users should look at\n \tlinkgit:git-status[1] `--short` or linkgit:git-diff[1]\n \t`--name-status` for more user-friendly alternatives.\n +\n-- \ngitgitgadget\n\n"},{"id":"482812","messageId":"9a1cf78194e7db1081e103f8d70c37c2d3c9cf85.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 23/25] documentation: add missing fullstops","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:25Z","receivedAt":"2023-10-08T06:46:56Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/git-check-ref-format.txt | 2 +-\n Documentation/git-diff-tree.txt | 2 +-\n Documentation/git-help.txt | 2 +-\n 3 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt\nindex 1d6e08e0119..2aacfd18088 100644\n--- a/Documentation/git-check-ref-format.txt\n+++ b/Documentation/git-check-ref-format.txt\n@@ -48,7 +48,7 @@ Git imposes the following rules on how references are named:\n \n . They cannot begin or end with a slash `/` or contain multiple\n consecutive slashes (see the `--normalize` option below for an\n- exception to this rule)\n+ exception to this rule).\n \n . They cannot end with a dot `.`.\n \ndiff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt\nindex 22380d5c829..143318c411a 100644\n--- a/Documentation/git-diff-tree.txt\n+++ b/Documentation/git-diff-tree.txt\n@@ -34,7 +34,7 @@ include::diff-options.txt[]\n \tmatching one of the provided pathspecs.\n \n -r::\n-\tRecurse into sub-trees\n+\tRecurse into sub-trees.\n \n -t::\n \tShow tree entry itself as well as subtrees. Implies -r.\ndiff --git a/Documentation/git-help.txt b/Documentation/git-help.txt\nindex 7532625a138..f0bedc1f964 100644\n--- a/Documentation/git-help.txt\n+++ b/Documentation/git-help.txt\n@@ -42,7 +42,7 @@ former is internally converted into the latter.\n \n To display the linkgit:git[1] man page, use `git help git`.\n \n-This page can be displayed with 'git help help' or `git help --help`\n+This page can be displayed with 'git help help' or `git help --help`.\n \n OPTIONS\n -------\n-- \ngitgitgadget\n\n"},{"id":"482813","messageId":"7c8422b0ca1e4b1c27d59846e5807c0363ddcc67.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 20/25] documentation: fix capitalization","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:22Z","receivedAt":"2023-10-08T06:46:58Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/config/checkout.txt | 2 +-\n Documentation/config/user.txt | 2 +-\n Documentation/git-diff-tree.txt | 4 ++--\n Documentation/git-hook.txt | 2 +-\n Documentation/git-mergetool--lib.txt | 10 +++++-----\n Documentation/git-stripspace.txt | 2 +-\n Documentation/git-update-server-info.txt | 2 +-\n Documentation/technical/reftable.txt | 2 +-\n 8 files changed, 13 insertions(+), 13 deletions(-)\n\ndiff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt\nindex a54faab238a..a3230229938 100644\n--- a/Documentation/config/checkout.txt\n+++ b/Documentation/config/checkout.txt\n@@ -30,7 +30,7 @@ checkout.workers::\n \tall commands that perform checkout. E.g. checkout, clone, reset,\n \tsparse-checkout, etc.\n +\n-Note: parallel checkout usually delivers better performance for repositories\n+Note: Parallel checkout usually delivers better performance for repositories\n located on SSDs or over NFS. For repositories on spinning disks and/or machines\n with a small number of cores, the default sequential checkout often performs\n better. The size and compression level of a repository might also influence how\ndiff --git a/Documentation/config/user.txt b/Documentation/config/user.txt\nindex 2bbc8e929f0..c1347fa7bcd 100644\n--- a/Documentation/config/user.txt\n+++ b/Documentation/config/user.txt\n@@ -40,7 +40,7 @@ user.signingKey::\n \tyour private ssh key or the public key when ssh-agent is used.\n \tAlternatively it can contain a public key prefixed with `key::`\n \tdirectly (e.g.: \"key::ssh-rsa XXXXXX identifier\"). The private key\n-\tneeds to be available via ssh-agent. If not set git will call\n+\tneeds to be available via ssh-agent. If not set Git will call\n \tgpg.ssh.defaultKeyCommand (e.g.: \"ssh-add -L\") and try to use the\n \tfirst key available. For backward compatibility, a raw key which\n \tbegins with \"ssh-\", such as \"ssh-rsa XXXXXX identifier\", is treated\ndiff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt\nindex c2772a566a3..22380d5c829 100644\n--- a/Documentation/git-diff-tree.txt\n+++ b/Documentation/git-diff-tree.txt\n@@ -34,10 +34,10 @@ include::diff-options.txt[]\n \tmatching one of the provided pathspecs.\n \n -r::\n- recurse into sub-trees\n+\tRecurse into sub-trees\n \n -t::\n-\tshow tree entry itself as well as subtrees. Implies -r.\n+\tShow tree entry itself as well as subtrees. Implies -r.\n \n --root::\n \tWhen `--root` is specified the initial commit will be shown as a big\ndiff --git a/Documentation/git-hook.txt b/Documentation/git-hook.txt\nindex 25237330b5c..f6cc72d2ca9 100644\n--- a/Documentation/git-hook.txt\n+++ b/Documentation/git-hook.txt\n@@ -32,7 +32,7 @@ OPTIONS\n -------\n \n --to-stdin::\n-\tFor \"run\"; Specify a file which will be streamed into the\n+\tFor \"run\"; specify a file which will be streamed into the\n \thook's stdin. The hook will receive the entire file from\n \tbeginning to EOF.\n \ndiff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt\nindex 3e8f59ac0e4..0726b560d43 100644\n--- a/Documentation/git-mergetool--lib.txt\n+++ b/Documentation/git-mergetool--lib.txt\n@@ -28,22 +28,22 @@ to define the operation mode for the functions listed below.\n FUNCTIONS\n ---------\n get_merge_tool::\n-\treturns a merge tool. the return code is 1 if we returned a guessed\n+\tReturns a merge tool. The return code is 1 if we returned a guessed\n \tmerge tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to\n \tsearch for the appropriate guitool.\n \n get_merge_tool_cmd::\n-\treturns the custom command for a merge tool.\n+\tReturns the custom command for a merge tool.\n \n get_merge_tool_path::\n-\treturns the custom path for a merge tool.\n+\tReturns the custom path for a merge tool.\n \n initialize_merge_tool::\n-\tbring merge tool specific functions into scope so they can be used or\n+\tBrings merge tool specific functions into scope so they can be used or\n \toverridden.\n \n run_merge_tool::\n-\tlaunches a merge tool given the tool name and a true/false\n+\tLaunches a merge tool given the tool name and a true/false\n \tflag to indicate whether a merge base is present.\n \t'$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined\n \tfor use by the merge tool.\ndiff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt\nindex 6b92cc7de78..a293327581a 100644\n--- a/Documentation/git-stripspace.txt\n+++ b/Documentation/git-stripspace.txt\n@@ -29,7 +29,7 @@ With no arguments, this will:\n In the case where the input consists entirely of whitespace characters, no\n output will be produced.\n \n-*NOTE*: This is intended for cleaning metadata, prefer the `--whitespace=fix`\n+*NOTE*: This is intended for cleaning metadata. Prefer the `--whitespace=fix`\n mode of linkgit:git-apply[1] for correcting whitespace of patches or files in\n the repository.\n \ndiff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt\nindex ff32986d4c5..6bc9b50d89f 100644\n--- a/Documentation/git-update-server-info.txt\n+++ b/Documentation/git-update-server-info.txt\n@@ -23,7 +23,7 @@ OPTIONS\n -------\n -f::\n --force::\n-\tupdate the info files from scratch.\n+\tUpdate the info files from scratch.\n \n OUTPUT\n ------\ndiff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.txt\nindex 6def498efd5..82d919b2615 100644\n--- a/Documentation/technical/reftable.txt\n+++ b/Documentation/technical/reftable.txt\n@@ -175,7 +175,7 @@ log_index*\n footer\n ....\n \n-in a log-only file the first log block immediately follows the file\n+In a log-only file the first log block immediately follows the file\n header, without padding to block alignment.\n \n Block size\n-- \ngitgitgadget\n\n"},{"id":"482814","messageId":"ed8de13f0a33121f4932a0f0c63ff59566d5d9dd.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 24/25] documentation: add missing quotes","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:26Z","receivedAt":"2023-10-08T06:47:00Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/git-quiltimport.txt | 4 ++--\n Documentation/technical/parallel-checkout.txt | 2 +-\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt\nindex 70562dc4c02..40e02d92eb2 100644\n--- a/Documentation/git-quiltimport.txt\n+++ b/Documentation/git-quiltimport.txt\n@@ -38,14 +38,14 @@ OPTIONS\n \ta patch. At the time of this writing only missing author\n \tinformation is warned about.\n \n---author Author Name ::\n+--author 'Author Name '::\n \tThe author name and email address to use when no author\n \tinformation can be found in the patch description.\n \n --patches ::\n \tThe directory to find the quilt patches.\n +\n-The default for the patch directory is patches\n+The default for the patch directory is 'patches'\n or the value of the `$QUILT_PATCHES` environment\n variable.\n \ndiff --git a/Documentation/technical/parallel-checkout.txt b/Documentation/technical/parallel-checkout.txt\nindex b5f54dcd451..b4a144e5f47 100644\n--- a/Documentation/technical/parallel-checkout.txt\n+++ b/Documentation/technical/parallel-checkout.txt\n@@ -126,7 +126,7 @@ Then, for each assigned item, each worker:\n \n * W5: Writes the result to the file descriptor opened at W2.\n \n-* W6: Calls `fstat()` or lstat()` on the just-written path, and sends\n+* W6: Calls `fstat()` or `lstat()` on the just-written path, and sends\n the result back to the main process, together with the end status of\n the operation and the item's identification number.\n \n-- \ngitgitgadget\n\n"},{"id":"482816","messageId":"96bd79af174f0cbb7fe434b2ef807719cf620008.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 15/25] documentation: add missing article","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:17Z","receivedAt":"2023-10-08T06:47:16Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/ReviewingGuidelines.txt | 2 +-\n Documentation/config/advice.txt | 2 +-\n Documentation/config/commit.txt | 2 +-\n Documentation/config/fsck.txt | 2 +-\n Documentation/config/gc.txt | 2 +-\n Documentation/config/gui.txt | 2 +-\n Documentation/config/man.txt | 2 +-\n Documentation/config/notes.txt | 2 +-\n Documentation/config/sendemail.txt | 2 +-\n Documentation/config/stash.txt | 8 ++++----\n Documentation/diff-generate-patch.txt | 10 +++++-----\n Documentation/fsck-msgids.txt | 2 +-\n Documentation/git-am.txt | 4 ++--\n Documentation/git-apply.txt | 4 ++--\n Documentation/git-blame.txt | 4 ++--\n Documentation/git-check-ref-format.txt | 2 +-\n Documentation/git-checkout-index.txt | 6 +++---\n Documentation/git-count-objects.txt | 2 +-\n Documentation/git-daemon.txt | 2 +-\n Documentation/git-diff-tree.txt | 2 +-\n Documentation/git-difftool.txt | 2 +-\n Documentation/git-fsck.txt | 2 +-\n Documentation/git-help.txt | 2 +-\n Documentation/git-http-push.txt | 4 ++--\n Documentation/git-init.txt | 4 ++--\n Documentation/git-mailsplit.txt | 2 +-\n Documentation/git-merge-base.txt | 2 +-\n Documentation/git-merge-tree.txt | 2 +-\n Documentation/git-mktag.txt | 2 +-\n Documentation/git-prune.txt | 2 +-\n Documentation/git-push.txt | 2 +-\n Documentation/git-read-tree.txt | 4 ++--\n Documentation/git-receive-pack.txt | 4 ++--\n Documentation/git-remote-ext.txt | 10 +++++-----\n Documentation/git-remote-fd.txt | 4 ++--\n Documentation/git-replace.txt | 2 +-\n Documentation/git-rev-parse.txt | 2 +-\n Documentation/git-send-pack.txt | 2 +-\n Documentation/git-sh-setup.txt | 2 +-\n Documentation/git-show-branch.txt | 2 +-\n Documentation/git-stripspace.txt | 2 +-\n Documentation/git-update-index.txt | 8 ++++----\n Documentation/git-update-ref.txt | 2 +-\n Documentation/git-update-server-info.txt | 2 +-\n Documentation/git-verify-pack.txt | 6 +++---\n Documentation/git-whatchanged.txt | 2 +-\n Documentation/gitcli.txt | 2 +-\n Documentation/gitdiffcore.txt | 6 +++---\n Documentation/gitformat-pack.txt | 8 ++++----\n Documentation/githooks.txt | 2 +-\n Documentation/gitprotocol-capabilities.txt | 2 +-\n Documentation/gitweb.txt | 8 ++++----\n Documentation/pretty-options.txt | 2 +-\n Documentation/pull-fetch-param.txt | 4 ++--\n Documentation/rev-list-options.txt | 4 ++--\n Documentation/technical/bitmap-format.txt | 2 +-\n Documentation/technical/partial-clone.txt | 2 +-\n 57 files changed, 93 insertions(+), 93 deletions(-)\n\ndiff --git a/Documentation/ReviewingGuidelines.txt b/Documentation/ReviewingGuidelines.txt\nindex 0e323d54779..3e98c8a6af0 100644\n--- a/Documentation/ReviewingGuidelines.txt\n+++ b/Documentation/ReviewingGuidelines.txt\n@@ -19,7 +19,7 @@ Principles\n Selecting patch(es) to review\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n If you are looking for a patch series in need of review, start by checking\n-latest \"What's cooking in git.git\" email\n+the latest \"What's cooking in git.git\" email\n (https://lore.kernel.org/git/xmqqilm1yp3m.fsf@gitster.g/[example]). The \"What's\n cooking\" emails & replies can be found using the query `s:\"What's cooking\"` on\n the https://lore.kernel.org/git/[`lore.kernel.org` mailing list archive];\ndiff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt\nindex c5cde1c24ee..2737381a11a 100644\n--- a/Documentation/config/advice.txt\n+++ b/Documentation/config/advice.txt\n@@ -5,7 +5,7 @@ advice.*::\n +\n --\n \tambiguousFetchRefspec::\n-\t\tAdvice shown when fetch refspec for multiple remotes maps to\n+\t\tAdvice shown when a fetch refspec for multiple remotes maps to\n \t\tthe same remote-tracking branch namespace and causes branch\n \t\ttracking set-up to fail.\n \tfetchShowForcedUpdates::\ndiff --git a/Documentation/config/commit.txt b/Documentation/config/commit.txt\nindex bcb46cf630e..62f0d92fda5 100644\n--- a/Documentation/config/commit.txt\n+++ b/Documentation/config/commit.txt\n@@ -2,7 +2,7 @@ commit.cleanup::\n \tThis setting overrides the default of the `--cleanup` option in\n \t`git commit`. See linkgit:git-commit[1] for details. Changing the\n \tdefault can be useful when you always want to keep lines that begin\n-\twith comment character `#` in your log message, in which case you\n+\twith the comment character `#` in your log message, in which case you\n \twould do `git config commit.cleanup whitespace` (note that you will\n \thave to remove the help lines that begin with `#` in the commit log\n \ttemplate yourself, if you do this).\ndiff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt\nindex 0687e86ba10..57114161063 100644\n--- a/Documentation/config/fsck.txt\n+++ b/Documentation/config/fsck.txt\n@@ -36,7 +36,7 @@ Setting an unknown `fsck.` value will cause fsck to die, but\n doing the same for `receive.fsck.` and `fetch.fsck.`\n will only cause git to warn.\n +\n-See `Fsck Messages` section of linkgit:git-fsck[1] for supported\n+See the `Fsck Messages` section of linkgit:git-fsck[1] for supported\n values of ``.\n \n \ndiff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt\nindex 17e2a8cc176..31f1fff53c4 100644\n--- a/Documentation/config/gc.txt\n+++ b/Documentation/config/gc.txt\n@@ -39,7 +39,7 @@ See the `gc.bigPackThreshold` configuration variable below. When in\n use, it'll affect how the auto pack limit works.\n \n gc.autoDetach::\n-\tMake `git gc --auto` return immediately and run in background\n+\tMake `git gc --auto` return immediately and run in the background\n \tif the system supports it. Default is true.\n \n gc.bigPackThreshold::\ndiff --git a/Documentation/config/gui.txt b/Documentation/config/gui.txt\nindex 0c087fd8c93..171be774d24 100644\n--- a/Documentation/config/gui.txt\n+++ b/Documentation/config/gui.txt\n@@ -24,7 +24,7 @@ gui.matchTrackingBranch::\n \tnot. Default: \"false\".\n \n gui.newBranchTemplate::\n-\tIs used as suggested name when creating new branches using the\n+\tIs used as a suggested name when creating new branches using the\n \tlinkgit:git-gui[1].\n \n gui.pruneDuringFetch::\ndiff --git a/Documentation/config/man.txt b/Documentation/config/man.txt\nindex a727d987a8d..5a0f82cc232 100644\n--- a/Documentation/config/man.txt\n+++ b/Documentation/config/man.txt\n@@ -5,7 +5,7 @@ man.viewer::\n man..cmd::\n \tSpecify the command to invoke the specified man viewer. The\n \tspecified command is evaluated in shell with the man page\n-\tpassed as argument. (See linkgit:git-help[1].)\n+\tpassed as an argument. (See linkgit:git-help[1].)\n \n man..path::\n \tOverride the path for the given tool that may be used to\ndiff --git a/Documentation/config/notes.txt b/Documentation/config/notes.txt\nindex c7c4811734b..43db8e808d7 100644\n--- a/Documentation/config/notes.txt\n+++ b/Documentation/config/notes.txt\n@@ -1,7 +1,7 @@\n notes.mergeStrategy::\n \tWhich merge strategy to choose by default when resolving notes\n \tconflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or\n-\t`cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\"\n+\t`cat_sort_uniq`. Defaults to `manual`. See the \"NOTES MERGE STRATEGIES\"\n \tsection of linkgit:git-notes[1] for more information on each strategy.\n +\n This setting can be overridden by passing the `--strategy` option to\ndiff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt\nindex 792e68a4456..7fc770ee9e6 100644\n--- a/Documentation/config/sendemail.txt\n+++ b/Documentation/config/sendemail.txt\n@@ -91,7 +91,7 @@ sendemail.smtpBatchSize::\n \tSee also the `--batch-size` option of linkgit:git-send-email[1].\n \n sendemail.smtpReloginDelay::\n-\tSeconds to wait before reconnecting to smtp server.\n+\tSeconds to wait before reconnecting to the smtp server.\n \tSee also the `--relogin-delay` option of linkgit:git-send-email[1].\n \n sendemail.forbidSendmailVariables::\ndiff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt\nindex b9f609ed76b..ec1edaeba68 100644\n--- a/Documentation/config/stash.txt\n+++ b/Documentation/config/stash.txt\n@@ -1,14 +1,14 @@\n stash.showIncludeUntracked::\n \tIf this is set to true, the `git stash show` command will show\n \tthe untracked files of a stash entry. Defaults to false. See\n-\tdescription of 'show' command in linkgit:git-stash[1].\n+\tthe description of the 'show' command in linkgit:git-stash[1].\n \n stash.showPatch::\n \tIf this is set to true, the `git stash show` command without an\n \toption will show the stash entry in patch form. Defaults to false.\n-\tSee description of 'show' command in linkgit:git-stash[1].\n+\tSee the description of the 'show' command in linkgit:git-stash[1].\n \n stash.showStat::\n \tIf this is set to true, the `git stash show` command without an\n-\toption will show diffstat of the stash entry. Defaults to true.\n-\tSee description of 'show' command in linkgit:git-stash[1].\n+\toption will show a diffstat of the stash entry. Defaults to true.\n+\tSee the description of the 'show' command in linkgit:git-stash[1].\ndiff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt\nindex 4b307cb51bb..cf1958ca632 100644\n--- a/Documentation/diff-generate-patch.txt\n+++ b/Documentation/diff-generate-patch.txt\n@@ -25,9 +25,9 @@ The `a/` and `b/` filenames are the same unless rename/copy is\n involved. Especially, even for a creation or a deletion,\n `/dev/null` is _not_ used in place of the `a/` or `b/` filenames.\n +\n-When rename/copy is involved, `file1` and `file2` show the\n+When a rename/copy is involved, `file1` and `file2` show the\n name of the source file of the rename/copy and the name of\n-the file that rename/copy produces, respectively.\n+the file that the rename/copy produces, respectively.\n \n 2. It is followed by one or more extended header lines:\n \n@@ -89,7 +89,7 @@ produce a 'combined diff' when showing a merge. This is the default\n format when showing merges with linkgit:git-diff[1] or\n linkgit:git-show[1]. Note also that you can give suitable\n `--diff-merges` option to any of these commands to force generation of\n-diffs in specific format.\n+diffs in a specific format.\n \n A \"combined diff\" format looks like this:\n \n@@ -143,7 +143,7 @@ or like this (when the `--cc` option is used):\n The `mode ,..` line appears only if at least one of\n the is different from the rest. Extended headers with\n information about detected content movement (renames and\n-copying detection) are designed to work with diff of two\n+copying detection) are designed to work with the diff of two\n and are not used by combined diff format.\n \n 3. It is followed by a two-line from-file/to-file header:\n@@ -151,7 +151,7 @@ copying detection) are designed to work with diff of two\n --- a/file\n +++ b/file\n +\n-Similar to two-line header for traditional 'unified' diff\n+Similar to the two-line header for the traditional 'unified' diff\n format, `/dev/null` is used to signal created or deleted\n files.\n +\ndiff --git a/Documentation/fsck-msgids.txt b/Documentation/fsck-msgids.txt\nindex 8505c244bcf..f643585a34e 100644\n--- a/Documentation/fsck-msgids.txt\n+++ b/Documentation/fsck-msgids.txt\n@@ -132,7 +132,7 @@\n \t(ERROR) Missing space before date in an author/committer line.\n \n `missingSpaceBeforeEmail`::\n-\t(ERROR) Missing space before the email in author/committer line.\n+\t(ERROR) Missing space before the email in an author/committer line.\n \n `missingTag`::\n \t(ERROR) Unexpected end after `type` line in a tag object.\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 51c26715159..00a5ec206d6 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -94,7 +94,7 @@ OPTIONS\n \tPass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n \tThe proposed commit log message taken from the e-mail\n \tis re-coded into UTF-8 encoding (configuration variable\n-\t`i18n.commitEncoding` can be used to specify project's\n+\t`i18n.commitEncoding` can be used to specify the project's\n \tpreferred encoding if it is not UTF-8).\n +\n This was optional in prior versions of git, but now it is the\n@@ -192,7 +192,7 @@ include::rerere-options.txt[]\n \n --abort::\n \tRestore the original branch and abort the patching operation.\n-\tRevert contents of files involved in the am operation to their\n+\tRevert the contents of files involved in the am operation to their\n \tpre-am state.\n \n --quit::\ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\nindex b6e7510d068..95bde308709 100644\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -140,7 +140,7 @@ linkgit:git-config[1]).\n \tapplying a diff generated with `--unified=0`. To bypass these\n \tchecks use `--unidiff-zero`.\n +\n-Note, for the reasons stated above usage of context-free patches is\n+Note, for the reasons stated above the usage of context-free patches is\n discouraged.\n \n --apply::\n@@ -257,7 +257,7 @@ the `--unsafe-paths` option to override this safety check. This option\n has no effect when `--index` or `--cached` is in use.\n \n --allow-empty::\n-\tDon't return error for patches containing no diff. This includes\n+\tDon't return an error for patches containing no diff. This includes\n \tempty patches and patches with commit text only.\n \n CONFIGURATION\ndiff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt\nindex a927c7c9f33..6f39147c051 100644\n--- a/Documentation/git-blame.txt\n+++ b/Documentation/git-blame.txt\n@@ -77,7 +77,7 @@ include::blame-options.txt[]\n \n -e::\n --show-email::\n-\tShow the author email instead of author name (Default: off).\n+\tShow the author email instead of the author name (Default: off).\n \tThis can also be controlled via the `blame.showEmail` config\n \toption.\n \n@@ -100,7 +100,7 @@ When neither `--porcelain` nor `--incremental` option is specified,\n `git blame` will output annotation for each line with:\n \n - abbreviated object name for the commit the line came from;\n-- author ident (by default author name and date, unless `-s` or `-e`\n+- author ident (by default the author name and date, unless `-s` or `-e`\n is specified); and\n - line number\n \ndiff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt\nindex ee6a4144fbe..1d6e08e0119 100644\n--- a/Documentation/git-check-ref-format.txt\n+++ b/Documentation/git-check-ref-format.txt\n@@ -85,7 +85,7 @@ The rule `git check-ref-format --branch $name` implements\n may be stricter than what `git check-ref-format refs/heads/$name`\n says (e.g. a dash may appear at the beginning of a ref component,\n but it is explicitly forbidden at the beginning of a branch name).\n-When run with `--branch` option in a repository, the input is first\n+When run with the `--branch` option in a repository, the input is first\n expanded for the ``previous checkout syntax''\n `@{-n}`. For example, `@{-1}` is a way to refer the last thing that\n was checked out using \"git switch\" or \"git checkout\" operation.\ndiff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt\nindex d1738f43308..4e2527612e0 100644\n--- a/Documentation/git-checkout-index.txt\n+++ b/Documentation/git-checkout-index.txt\n@@ -53,7 +53,7 @@ OPTIONS\n \n --stage=|all::\n \tInstead of checking out unmerged entries, copy out the\n-\tfiles from named stage. must be between 1 and 3.\n+\tfiles from the named stage. must be between 1 and 3.\n \tNote: --stage=all automatically implies --temp.\n \n --temp::\n@@ -66,8 +66,8 @@ OPTIONS\n \tset.\n \n --stdin::\n-\tInstead of taking list of paths from the command line,\n-\tread list of paths from the standard input. Paths are\n+\tInstead of taking a list of paths from the command line,\n+\tread the list of paths from the standard input. Paths are\n \tseparated by LF (i.e. one path per line) by default.\n \n -z::\ndiff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt\nindex b28cc3a510a..97f9f126101 100644\n--- a/Documentation/git-count-objects.txt\n+++ b/Documentation/git-count-objects.txt\n@@ -33,7 +33,7 @@ size-pack: disk space consumed by the packs, in KiB (unless -H is specified)\n prune-packable: the number of loose objects that are also present in\n the packs. These objects could be pruned using `git prune-packed`.\n +\n-garbage: the number of files in object database that are neither valid loose\n+garbage: the number of files in the object database that are neither valid loose\n objects nor valid packs\n +\n size-garbage: disk space consumed by garbage files, in KiB (unless -H is\ndiff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt\nindex 236df516c73..e064f91c9e3 100644\n--- a/Documentation/git-daemon.txt\n+++ b/Documentation/git-daemon.txt\n@@ -138,7 +138,7 @@ otherwise `stderr`.\n --user-path::\n --user-path=::\n \tAllow {tilde}user notation to be used in requests. When\n-\tspecified with no parameter, requests to\n+\tspecified with no parameter, a request to\n \tgit://host/{tilde}alice/foo is taken as a request to access\n \t'foo' repository in the home directory of user `alice`.\n \tIf `--user-path=path` is specified, the same request is\ndiff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt\nindex 1e34f80daa9..c2772a566a3 100644\n--- a/Documentation/git-diff-tree.txt\n+++ b/Documentation/git-diff-tree.txt\n@@ -78,7 +78,7 @@ commits (but not trees).\n \tBy default, 'git diff-tree --stdin' shows differences,\n \teither in machine-readable form (without `-p`) or in patch\n \tform (with `-p`). This output can be suppressed. It is\n-\tonly useful with `-v` flag.\n+\tonly useful with the `-v` flag.\n \n -v::\n \tThis flag causes 'git diff-tree --stdin' to also show\ndiff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt\nindex 179e5ae2162..50cb080085e 100644\n--- a/Documentation/git-difftool.txt\n+++ b/Documentation/git-difftool.txt\n@@ -36,7 +36,7 @@ OPTIONS\n \n --rotate-to=::\n \tStart showing the diff for the given path,\n-\tthe paths before it will move to end and output.\n+\tthe paths before it will move to the end and output.\n \n --skip-to=::\n \tStart showing the diff for the given path, skipping all\ndiff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt\nindex e4980d28615..5b82e4605c2 100644\n--- a/Documentation/git-fsck.txt\n+++ b/Documentation/git-fsck.txt\n@@ -24,7 +24,7 @@ OPTIONS\n \tAn object to treat as the head of an unreachability trace.\n +\n If no objects are given, 'git fsck' defaults to using the\n-index file, all SHA-1 references in `refs` namespace, and all reflogs\n+index file, all SHA-1 references in the `refs` namespace, and all reflogs\n (unless --no-reflogs is given) as heads.\n \n --unreachable::\ndiff --git a/Documentation/git-help.txt b/Documentation/git-help.txt\nindex ee18a2b7432..22dfd780851 100644\n--- a/Documentation/git-help.txt\n+++ b/Documentation/git-help.txt\n@@ -85,7 +85,7 @@ pseudo-configuration such as the file-based `.git/hooks/*` interface\n described in linkgit:githooks[5].\n \n --developer-interfaces::\n-\tPrint list of file formats, protocols and other developer\n+\tPrint a list of file formats, protocols and other developer\n \tinterfaces documentation on the standard output.\n \n -i::\ndiff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt\nindex 8b4a5791c8c..c0c841b9fdd 100644\n--- a/Documentation/git-http-push.txt\n+++ b/Documentation/git-http-push.txt\n@@ -13,12 +13,12 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Sends missing objects to remote repository, and updates the\n+Sends missing objects to the remote repository, and updates the\n remote branch.\n \n *NOTE*: This command is temporarily disabled if your libcurl\n is older than 7.16, as the combination has been reported\n-not to work and sometimes corrupts repository.\n+not to work and sometimes corrupts the repository.\n \n OPTIONS\n -------\ndiff --git a/Documentation/git-init.txt b/Documentation/git-init.txt\nindex 138dc4a3bfe..3c3c1e730c3 100644\n--- a/Documentation/git-init.txt\n+++ b/Documentation/git-init.txt\n@@ -66,10 +66,10 @@ DIRECTORY\" section below.)\n \n Instead of initializing the repository as a directory to either `$GIT_DIR` or\n `./.git/`, create a text file there containing the path to the actual\n-repository. This file acts as filesystem-agnostic Git symbolic link to the\n+repository. This file acts as a filesystem-agnostic Git symbolic link to the\n repository.\n +\n-If this is reinitialization, the repository will be moved to the specified path.\n+If this is a reinitialization, the repository will be moved to the specified path.\n \n -b ::\n --initial-branch=::\ndiff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt\nindex e3b2a88c4b7..3f0a6662c81 100644\n--- a/Documentation/git-mailsplit.txt\n+++ b/Documentation/git-mailsplit.txt\n@@ -34,7 +34,7 @@ OPTIONS\n \n -b::\n \tIf any file doesn't begin with a From line, assume it is a\n-\tsingle mail message instead of signaling error.\n+\tsingle mail message instead of signaling an error.\n \n -d::\n \tInstead of the default 4 digits with leading zeros,\ndiff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt\nindex b01ba3d3565..463764b9c1e 100644\n--- a/Documentation/git-merge-base.txt\n+++ b/Documentation/git-merge-base.txt\n@@ -18,7 +18,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n \n-'git merge-base' finds best common ancestor(s) between two commits to use\n+'git merge-base' finds the best common ancestor(s) between two commits to use\n in a three-way merge. One common ancestor is 'better' than another common\n ancestor if the latter is an ancestor of the former. A common ancestor\n that does not have any better common ancestor is a 'best common\ndiff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt\nindex 9f951c7fe34..b50acace3bc 100644\n--- a/Documentation/git-merge-tree.txt\n+++ b/Documentation/git-merge-tree.txt\n@@ -19,7 +19,7 @@ DESCRIPTION\n This command has a modern `--write-tree` mode and a deprecated\n `--trivial-merge` mode. With the exception of the\n <> section at the end, the rest of\n-this documentation describes modern `--write-tree` mode.\n+this documentation describes the modern `--write-tree` mode.\n \n Performs a merge, but does not make any new commits and does not read\n from or write to either the working tree or index.\ndiff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt\nindex 7a014962343..006d759962a 100644\n--- a/Documentation/git-mktag.txt\n+++ b/Documentation/git-mktag.txt\n@@ -56,7 +56,7 @@ has a very simple fixed format: four lines of\n tagger \n \n followed by some 'optional' free-form message (some tags created\n-by older Git may not have `tagger` line). The message, when it\n+by older Git may not have a `tagger` line). The message, when it\n exists, is separated by a blank line from the header. The\n message part may contain a signature that Git itself doesn't\n care about, but that can be verified with gpg.\ndiff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt\nindex 03552dd86fc..9a45571b901 100644\n--- a/Documentation/git-prune.txt\n+++ b/Documentation/git-prune.txt\n@@ -18,7 +18,7 @@ NOTE: In most cases, users should run 'git gc', which calls\n 'git prune'. See the section \"NOTES\", below.\n \n This runs 'git fsck --unreachable' using all the refs\n-available in `refs/`, optionally with additional set of\n+available in `refs/`, optionally with an additional set of\n objects specified on the command line, and prunes all unpacked\n objects unreachable from any of these head objects from the object database.\n In addition, it\ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex 5b4edaf4a8d..c12caedbb18 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -48,7 +48,7 @@ local one.\n OPTIONS[[OPTIONS]]\n ------------------\n ::\n-\tThe \"remote\" repository that is destination of a push\n+\tThe \"remote\" repository that is the destination of a push\n \toperation. This parameter can be either a URL\n \t(see the section <> below) or the name\n \tof a remote (see the section <> below).\ndiff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt\nindex 32065318532..1c48c289963 100644\n--- a/Documentation/git-read-tree.txt\n+++ b/Documentation/git-read-tree.txt\n@@ -26,14 +26,14 @@ flag. When used with `-m`, the `-u` flag causes it to also update\n the files in the work tree with the result of the merge.\n \n Only trivial merges are done by 'git read-tree' itself. Only conflicting paths\n-will be in unmerged state when 'git read-tree' returns.\n+will be in an unmerged state when 'git read-tree' returns.\n \n OPTIONS\n -------\n -m::\n \tPerform a merge, not just a read. The command will\n \trefuse to run if your index file has unmerged entries,\n-\tindicating that you have not finished previous merge you\n+\tindicating that you have not finished a previous merge you\n \tstarted.\n \n --reset::\ndiff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt\nindex 65ff518ccff..20aca92073d 100644\n--- a/Documentation/git-receive-pack.txt\n+++ b/Documentation/git-receive-pack.txt\n@@ -18,10 +18,10 @@ information fed from the remote end.\n \n This command is usually not invoked directly by the end user.\n The UI for the protocol is on the 'git send-pack' side, and the\n-program pair is meant to be used to push updates to remote\n+program pair is meant to be used to push updates to a remote\n repository. For pull operations, see linkgit:git-fetch-pack[1].\n \n-The command allows for creation and fast-forwarding of sha1 refs\n+The command allows for the creation and fast-forwarding of sha1 refs\n (heads/tags) on the remote end (strictly speaking, it is the\n local end 'git-receive-pack' runs, but to the user who is sitting at\n the send-pack end, it is updating the remote. Confused?)\ndiff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt\nindex 17d84f23c99..b33ee3c9e86 100644\n--- a/Documentation/git-remote-ext.txt\n+++ b/Documentation/git-remote-ext.txt\n@@ -44,15 +44,15 @@ The following sequences have a special meaning:\n \tThis argument will not be passed to ''. Instead, it\n \twill cause the helper to start by sending git:// service requests to\n \tthe remote side with the service field set to an appropriate value and\n-\tthe repository field set to rest of the argument. Default is not to send\n+\tthe repository field set to the rest of the argument. Default is not to send\n \tsuch a request.\n +\n-This is useful if remote side is git:// server accessed over\n+This is useful if the remote side is git:// server accessed over\n some tunnel.\n \n '%V' (must be first characters in argument)::\n \tThis argument will not be passed to ''. Instead it sets\n-\tthe vhost field in the git:// service request (to rest of the argument).\n+\tthe vhost field in the git:// service request (to the rest of the argument).\n \tDefault is not to send vhost in such request (if sent).\n \n ENVIRONMENT VARIABLES\n@@ -82,12 +82,12 @@ begins with `ext::`. Examples:\n \n \"ext::ssh -i /home/foo/.ssh/somekey user@host.example %S 'foo/repo'\"::\n \tLike host.example:foo/repo, but use /home/foo/.ssh/somekey as\n-\tkeypair and user as user on remote side. This avoids the need to\n+\tkeypair and user as the user on the remote side. This avoids the need to\n \tedit .ssh/config.\n \n \"ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo\"::\n \tRepresents repository with path /somerepo accessible over\n-\tgit protocol at abstract namespace address /git-server.\n+\tgit protocol at the abstract namespace address /git-server.\n \n \"ext::git-server-alias foo %G/repo\"::\n \tRepresents a repository with path /repo accessed using the\ndiff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt\nindex 0451ceb8a26..6ed71bd0b75 100644\n--- a/Documentation/git-remote-fd.txt\n+++ b/Documentation/git-remote-fd.txt\n@@ -25,7 +25,7 @@ It is assumed that any handshaking procedures have already been completed\n (such as sending service request for git://) before this helper is started.\n \n can be any string. It is ignored. It is meant for providing\n-information to user in the URL in case that URL is displayed in some\n+information to the user in the URL in case that URL is displayed in some\n context.\n \n ENVIRONMENT VARIABLES\n@@ -45,7 +45,7 @@ EXAMPLES\n `git push fd::7,8 master (as URL)`::\n \tPush master, using file descriptor #7 to read data from\n \tgit-receive-pack and file descriptor #8 to write data to\n-\tsame service.\n+\tthe same service.\n \n `git push fd::7,8/bar master`::\n \tSame as above.\ndiff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt\nindex fdd2e0f0883..4f257126e33 100644\n--- a/Documentation/git-replace.txt\n+++ b/Documentation/git-replace.txt\n@@ -35,7 +35,7 @@ Replacement references will be used by default by all Git commands\n except those doing reachability traversal (prune, pack transfer and\n fsck).\n \n-It is possible to disable use of replacement references for any\n+It is possible to disable the use of replacement references for any\n command using the `--no-replace-objects` option just after 'git'.\n \n For example if commit 'foo' has been replaced by commit 'bar':\ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex 7b3ce3012e3..f42fb938705 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -14,7 +14,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n \n-Many Git porcelainish commands take mixture of flags\n+Many Git porcelainish commands take a mixture of flags\n (i.e. parameters that begin with a dash '-') and parameters\n meant for the underlying 'git rev-list' command they use internally\n and flags and parameters for the other commands they use\ndiff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt\nindex 9c1ed757b9d..b9e73f2e77b 100644\n--- a/Documentation/git-send-pack.txt\n+++ b/Documentation/git-send-pack.txt\n@@ -106,7 +106,7 @@ SPECIFYING THE REFS\n There are three ways to specify which refs to update on the\n remote end.\n \n-With `--all` flag, all refs that exist locally are transferred to\n+With the `--all` flag, all refs that exist locally are transferred to\n the remote side. You cannot specify any '' if you use\n this flag.\n \ndiff --git a/Documentation/git-sh-setup.txt b/Documentation/git-sh-setup.txt\nindex 8632612c31d..bdaf6e5fc4f 100644\n--- a/Documentation/git-sh-setup.txt\n+++ b/Documentation/git-sh-setup.txt\n@@ -22,7 +22,7 @@ The 'git sh-setup' scriptlet is designed to be sourced (using\n the normal Git directories and a few helper shell functions.\n \n Before sourcing it, your script should set up a few variables;\n-`USAGE` (and `LONG_USAGE`, if any) is used to define message\n+`USAGE` (and `LONG_USAGE`, if any) is used to define the message\n given by `usage()` shell function. `SUBDIRECTORY_OK` can be set\n if the script can run from a subdirectory of the working tree\n (some commands do not).\ndiff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\nindex 080b5246a4e..ddf24aeb87d 100644\n--- a/Documentation/git-show-branch.txt\n+++ b/Documentation/git-show-branch.txt\n@@ -137,7 +137,7 @@ their commit message. The branch head that is pointed at by\n $GIT_DIR/HEAD is prefixed with an asterisk `*` character while other\n heads are prefixed with a `!` character.\n \n-Following these N lines, one-line log for each commit is\n+Following these N lines, a one-line log for each commit is\n displayed, indented N places. If a commit is on the I-th\n branch, the I-th indentation character shows a `+` sign;\n otherwise it shows a space. Merge commits are denoted by\ndiff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt\nindex 3dc630da4b7..6b92cc7de78 100644\n--- a/Documentation/git-stripspace.txt\n+++ b/Documentation/git-stripspace.txt\n@@ -37,7 +37,7 @@ OPTIONS\n -------\n -s::\n --strip-comments::\n-\tSkip and remove all lines starting with comment character (default '#').\n+\tSkip and remove all lines starting with a comment character (default '#').\n \n -c::\n --comment-lines::\ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\nindex 7f0c950a5fd..7ac2e37c0ac 100644\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -95,7 +95,7 @@ OPTIONS\n \tthe index. If you want to change the working tree file,\n \tyou need to unset the bit to tell Git. This is\n \tsometimes helpful when working with a big project on a\n-\tfilesystem that has very slow lstat(2) system call\n+\tfilesystem that has a very slow lstat(2) system call\n \t(e.g. cifs).\n +\n Git will fail (gracefully) in case it needs to modify this file\n@@ -151,12 +151,12 @@ you will need to handle the situation manually.\n \tautomatically removed with warning messages.\n \n --stdin::\n-\tInstead of taking list of paths from the command line,\n-\tread list of paths from the standard input. Paths are\n+\tInstead of taking a list of paths from the command line,\n+\tread a list of paths from the standard input. Paths are\n \tseparated by LF (i.e. one path per line) by default.\n \n --verbose::\n- Report what is being added and removed from index.\n+\tReport what is being added and removed from the index.\n \n --index-version ::\n \tWrite the resulting index out in the named on-disk format version.\ndiff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt\nindex 48b6683071e..0561808cca0 100644\n--- a/Documentation/git-update-ref.txt\n+++ b/Documentation/git-update-ref.txt\n@@ -118,7 +118,7 @@ verify::\n \t is zero or missing, the ref must not exist.\n \n option::\n-\tModify behavior of the next command naming a .\n+\tModify the behavior of the next command naming a .\n \tThe only valid option is `no-deref` to avoid dereferencing\n \ta symbolic ref.\n \ndiff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt\nindex 17e429dbd09..ff32986d4c5 100644\n--- a/Documentation/git-update-server-info.txt\n+++ b/Documentation/git-update-server-info.txt\n@@ -29,7 +29,7 @@ OUTPUT\n ------\n \n Currently the command updates the following files. Please see\n-linkgit:gitrepository-layout[5] for description of\n+linkgit:gitrepository-layout[5] for a description of\n what they are for:\n \n * objects/info/packs\ndiff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt\nindex b8720dce8ab..d7e886918aa 100644\n--- a/Documentation/git-verify-pack.txt\n+++ b/Documentation/git-verify-pack.txt\n@@ -15,7 +15,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n Reads given idx file for packed Git archive created with the\n-'git pack-objects' command and verifies idx file and the\n+'git pack-objects' command and verifies the idx file and the\n corresponding pack file.\n \n OPTIONS\n@@ -25,13 +25,13 @@ OPTIONS\n \n -v::\n --verbose::\n-\tAfter verifying the pack, show list of objects contained\n+\tAfter verifying the pack, show the list of objects contained\n \tin the pack and a histogram of delta chain length.\n \n -s::\n --stat-only::\n \tDo not verify the pack contents; only show the histogram of delta\n-\tchain length. With `--verbose`, list of objects is also shown.\n+\tchain length. With `--verbose`, the list of objects is also shown.\n \n \\--::\n \tDo not interpret any more arguments as options.\ndiff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt\nindex fc2dc5a3b1d..8e55e0bb1ec 100644\n--- a/Documentation/git-whatchanged.txt\n+++ b/Documentation/git-whatchanged.txt\n@@ -22,7 +22,7 @@ but defaults to showing the raw format diff output and skipping merges.\n \n The command is primarily kept for historical reasons; fingers of\n many people who learned Git long before `git log` was invented by\n-reading Linux kernel mailing list are trained to type it.\n+reading the Linux kernel mailing list are trained to type it.\n \n \n Examples\ndiff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt\nindex 71ffe5556ae..e5fac943227 100644\n--- a/Documentation/gitcli.txt\n+++ b/Documentation/gitcli.txt\n@@ -37,7 +37,7 @@ arguments. Here are the rules:\n they can be disambiguated by placing `--` between them.\n E.g. `git diff -- HEAD` is, \"I have a file called HEAD in my work\n tree. Please show changes between the version I staged in the index\n- and what I have in the work tree for that file\", not \"show difference\n+ and what I have in the work tree for that file\", not \"show the difference\n between the HEAD commit and the work tree as a whole\". You can say\n `git diff HEAD --` to ask for the latter.\n \ndiff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt\nindex 411ce863598..bc65f91310d 100644\n--- a/Documentation/gitdiffcore.txt\n+++ b/Documentation/gitdiffcore.txt\n@@ -213,7 +213,7 @@ from the original, and does not count insertion. If you removed\n only 10 lines from a 100-line document, even if you added 910\n new lines to make a new 1000-line document, you did not do a\n complete rewrite. diffcore-break breaks such a case in order to\n-help diffcore-rename to consider such filepairs as candidate of\n+help diffcore-rename to consider such filepairs as a candidate of\n rename/copy detection, but if filepairs broken that way were not\n matched with other filepairs to create rename/copy, then this\n transformation merges them back into the original\n@@ -235,8 +235,8 @@ creation and deletion patches. This was an unnecessary hack and\n the latest implementation always merges all the broken pairs\n back into modifications, but the resulting patch output is\n formatted differently for easier review in case of such\n-a complete rewrite by showing the entire contents of old version\n-prefixed with '-', followed by the entire contents of new\n+a complete rewrite by showing the entire contents of the old version\n+prefixed with '-', followed by the entire contents of the new\n version prefixed with '+'.\n \n \ndiff --git a/Documentation/gitformat-pack.txt b/Documentation/gitformat-pack.txt\nindex f5d07a125d9..678a7e4cb49 100644\n--- a/Documentation/gitformat-pack.txt\n+++ b/Documentation/gitformat-pack.txt\n@@ -48,7 +48,7 @@ Similarly, in SHA-256 repositories, these values are computed using SHA-256.\n Observation: we cannot have more than 4G versions ;-) and\n more than 4G objects in a pack.\n \n- - The header is followed by number of object entries, each of\n+ - The header is followed by a number of object entries, each of\n which looks like this:\n \n (undeltified representation)\n@@ -62,7 +62,7 @@ Similarly, in SHA-256 repositories, these values are computed using SHA-256.\n \t is an OBJ_OFS_DELTA object\n compressed delta data\n \n- Observation: length of each object is encoded in a variable\n+ Observation: the length of each object is encoded in a variable\n length format and is not constrained to 32-bit or anything.\n \n - The trailer records a pack checksum of all of the above.\n@@ -161,7 +161,7 @@ converted to 0x10000.\n | 0xxxxxxx | data |\n +----------+============+\n \n-This is the instruction to construct target object without the base\n+This is the instruction to construct the target object without the base\n object. The following data is appended to the target object. The first\n seven bits of the first octet determine the size of data in\n bytes. The size must be non-zero.\n@@ -294,7 +294,7 @@ Pack file entry: <+\n \n - The same trailer as a v1 pack file:\n \n- A copy of the pack checksum at the end of\n+ A copy of the pack checksum at the end of the\n corresponding packfile.\n \n Index checksum of all of the above.\ndiff --git a/Documentation/githooks.txt b/Documentation/githooks.txt\nindex e62ad343eda..883982e7a05 100644\n--- a/Documentation/githooks.txt\n+++ b/Documentation/githooks.txt\n@@ -157,7 +157,7 @@ If the exit status is non-zero, `git commit` will abort.\n The purpose of the hook is to edit the message file in place, and\n it is not suppressed by the `--no-verify` option. A non-zero exit\n means a failure of the hook and aborts the commit. It should not\n-be used as replacement for pre-commit hook.\n+be used as a replacement for the pre-commit hook.\n \n The sample `prepare-commit-msg` hook that comes with Git removes the\n help message found in the commented portion of the commit template.\ndiff --git a/Documentation/gitprotocol-capabilities.txt b/Documentation/gitprotocol-capabilities.txt\nindex 388846d92e9..d6c6effc215 100644\n--- a/Documentation/gitprotocol-capabilities.txt\n+++ b/Documentation/gitprotocol-capabilities.txt\n@@ -88,7 +88,7 @@ interleaved with S-R-Q.\n \n multi_ack_detailed\n ------------------\n-This is an extension of multi_ack that permits client to better\n+This is an extension of multi_ack that permits the client to better\n understand the server's in-memory state. See linkgit:gitprotocol-pack[5],\n section \"Packfile Negotiation\" for more information.\n \ndiff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt\nindex 41ce55e266a..1030e9667ea 100644\n--- a/Documentation/gitweb.txt\n+++ b/Documentation/gitweb.txt\n@@ -41,9 +41,9 @@ for details.\n Repositories\n ~~~~~~~~~~~~\n Gitweb can show information from one or more Git repositories. These\n-repositories have to be all on local filesystem, and have to share common\n+repositories have to be all on local filesystem, and have to share a common\n repository root, i.e. be all under a single parent repository (but see also\n-\"Advanced web server setup\" section, \"Webserver configuration with multiple\n+the \"Advanced web server setup\" section, \"Webserver configuration with multiple\n projects' root\" subsection).\n \n -----------------------------------------------------------------------\n@@ -51,7 +51,7 @@ our $projectroot = '/path/to/parent/directory';\n -----------------------------------------------------------------------\n \n The default value for `$projectroot` is `/pub/git`. You can change it during\n-building gitweb via `GITWEB_PROJECTROOT` build configuration variable.\n+building gitweb via the `GITWEB_PROJECTROOT` build configuration variable.\n \n By default all Git repositories under `$projectroot` are visible and available\n to gitweb. The list of projects is generated by default by scanning the\n@@ -66,7 +66,7 @@ found at \"$projectroot/$repo\".\n \n Projects list file format\n ~~~~~~~~~~~~~~~~~~~~~~~~~\n-Instead of having gitweb find repositories by scanning filesystem\n+Instead of having gitweb find repositories by scanning the filesystem\n starting from $projectroot, you can provide a pre-generated list of\n visible projects by setting `$projects_list` to point to a plain text\n file with a list of projects (with some additional info).\ndiff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt\nindex 15c6f2705d4..23888cd612c 100644\n--- a/Documentation/pretty-options.txt\n+++ b/Documentation/pretty-options.txt\n@@ -48,7 +48,7 @@ people using 80-column terminals.\n --expand-tabs::\n --no-expand-tabs::\n \tPerform a tab expansion (replace each tab with enough spaces\n-\tto fill to the next display column that is multiple of '')\n+\tto fill to the next display column that is a multiple of '')\n \tin the log message before showing it in the output.\n \t`--expand-tabs` is a short-hand for `--expand-tabs=8`, and\n \t`--no-expand-tabs` is a short-hand for `--expand-tabs=0`,\ndiff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt\nindex 74143ef0d24..c718f7946f0 100644\n--- a/Documentation/pull-fetch-param.txt\n+++ b/Documentation/pull-fetch-param.txt\n@@ -80,7 +80,7 @@ configuration which'll amend these rules, and nothing like a\n +\n As with pushing with linkgit:git-push[1], all of the rules described\n above about what's not allowed as an update can be overridden by\n-adding an optional leading `+` to a refspec (or using `--force`\n+adding an optional leading `+` to a refspec (or using the `--force`\n command line option). The only exception to this is that no amount of\n forcing will make the `refs/heads/*` namespace accept a non-commit\n object.\n@@ -88,7 +88,7 @@ object.\n [NOTE]\n When the remote branch you want to fetch is known to\n be rewound and rebased regularly, it is expected that\n-its new tip will not be descendant of its previous tip\n+its new tip will not be a descendant of its previous tip\n (as stored in your remote-tracking branch the last time\n you fetched). You would want\n to use the `+` sign to indicate non-fast-forward updates\ndiff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\nindex 66d71d1b957..2bf239ff030 100644\n--- a/Documentation/rev-list-options.txt\n+++ b/Documentation/rev-list-options.txt\n@@ -56,7 +56,7 @@ endif::git-rev-list[]\n \terror to use this option unless `--walk-reflogs` is in use.\n \n --grep=::\n-\tLimit the commits output to ones with log message that\n+\tLimit the commits output to ones with a log message that\n \tmatches the specified pattern (regular expression). With\n \tmore than one `--grep=`, commits whose message\n \tmatches any of the given patterns are chosen (but see\n@@ -72,7 +72,7 @@ endif::git-rev-list[]\n \tinstead of ones that match at least one.\n \n --invert-grep::\n-\tLimit the commits output to ones with log message that do not\n+\tLimit the commits output to ones with a log message that do not\n \tmatch the pattern specified with `--grep=`.\n \n -i::\ndiff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.txt\nindex f761828f106..f5d200939b0 100644\n--- a/Documentation/technical/bitmap-format.txt\n+++ b/Documentation/technical/bitmap-format.txt\n@@ -239,7 +239,7 @@ bitmaps.\n \n For a `.bitmap` containing `nr_entries` reachability bitmaps, the table\n contains a list of `nr_entries` triplets\n-(sorted in the ascending order of `commit_pos`). The content of i'th\n+(sorted in the ascending order of `commit_pos`). The content of the i'th\n triplet is -\n \n \t* {empty}\ndiff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt\nindex 29876ca582a..cd948b00722 100644\n--- a/Documentation/technical/partial-clone.txt\n+++ b/Documentation/technical/partial-clone.txt\n@@ -256,7 +256,7 @@ remote in a specific order.\n - Dynamic object fetching currently uses the existing pack protocol V0\n which means that each object is requested via fetch-pack. The server\n will send a full set of info/refs when the connection is established.\n- If there are large number of refs, this may incur significant overhead.\n+ If there are a large number of refs, this may incur significant overhead.\n \n \n Future Work\n-- \ngitgitgadget\n\n"},{"id":"482815","messageId":"d0192cc5a3dbe120437867666febfa37c908b7b0.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 25/25] documentation: add missing parenthesis","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:27Z","receivedAt":"2023-10-08T06:47:18Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/git-remote-fd.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt\nindex 94700b89be9..1dd2648a790 100644\n--- a/Documentation/git-remote-fd.txt\n+++ b/Documentation/git-remote-fd.txt\n@@ -19,7 +19,7 @@ If only is given, it is assumed to be a bidirectional socket connected\n to a remote Git server (git-upload-pack, git-receive-pack, or\n git-upload-archive). If both and are given, they are assumed\n to be pipes connected to a remote Git server ( being the inbound pipe\n-and being the outbound pipe.\n+and being the outbound pipe).\n \n It is assumed that any handshaking procedures have already been completed\n (such as sending service request for git://) before this helper is started.\n-- \ngitgitgadget\n"},{"id":"482817","messageId":"e4fa43bf48d73b1c177ee67b88964369fb6f3c87.1696747529.git.gitgitgadget@gmail.com","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"[PATCH 22/25] documentation: add some commas where they are helpful","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-10-08T06:45:24Z","receivedAt":"2023-10-08T06:47:19Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nDiff best viewed with --color-diff.\n\nSigned-off-by: Elijah Newren \n---\n Documentation/ToolsForGit.txt | 2 +-\n Documentation/config/clean.txt | 2 +-\n Documentation/config/color.txt | 2 +-\n Documentation/config/credential.txt | 2 +-\n Documentation/config/fastimport.txt | 4 ++--\n Documentation/config/fsck.txt | 10 +++++-----\n Documentation/config/log.txt | 2 +-\n Documentation/config/merge.txt | 2 +-\n Documentation/config/mergetool.txt | 10 +++++-----\n Documentation/config/push.txt | 2 +-\n Documentation/config/sequencer.txt | 2 +-\n Documentation/config/splitindex.txt | 6 +++---\n Documentation/config/user.txt | 4 ++--\n Documentation/config/versionsort.txt | 2 +-\n Documentation/diff-generate-patch.txt | 4 ++--\n Documentation/fetch-options.txt | 2 +-\n Documentation/git-am.txt | 4 ++--\n Documentation/git-apply.txt | 10 +++++-----\n Documentation/git-check-attr.txt | 4 ++--\n Documentation/git-checkout-index.txt | 2 +-\n Documentation/git-diff-files.txt | 4 ++--\n Documentation/git-fast-import.txt | 2 +-\n Documentation/git-fsmonitor--daemon.txt | 4 ++--\n Documentation/git-help.txt | 6 +++---\n Documentation/git-http-push.txt | 2 +-\n Documentation/git-merge-base.txt | 4 ++--\n Documentation/git-mergetool.txt | 4 ++--\n Documentation/git-mv.txt | 2 +-\n Documentation/git-name-rev.txt | 2 +-\n Documentation/git-remote-fd.txt | 4 ++--\n Documentation/git-request-pull.txt | 2 +-\n Documentation/git-show-branch.txt | 4 ++--\n Documentation/git-update-index.txt | 2 +-\n Documentation/gitdiffcore.txt | 4 ++--\n Documentation/gitformat-pack.txt | 2 +-\n Documentation/technical/api-simple-ipc.txt | 4 ++--\n Documentation/technical/reftable.txt | 2 +-\n 37 files changed, 66 insertions(+), 66 deletions(-)\n\ndiff --git a/Documentation/ToolsForGit.txt b/Documentation/ToolsForGit.txt\nindex 209eaad31ea..ae7690b45d0 100644\n--- a/Documentation/ToolsForGit.txt\n+++ b/Documentation/ToolsForGit.txt\n@@ -5,7 +5,7 @@ Tools for developing Git\n [[summary]]\n == Summary\n \n-This document gathers tips, scripts and configuration files to help people\n+This document gathers tips, scripts, and configuration files to help people\n working on Git's codebase use their favorite tools while following Git's\n coding style.\n \ndiff --git a/Documentation/config/clean.txt b/Documentation/config/clean.txt\nindex a807c925b9c..f05b9403b5a 100644\n--- a/Documentation/config/clean.txt\n+++ b/Documentation/config/clean.txt\n@@ -1,3 +1,3 @@\n clean.requireForce::\n \tA boolean to make git-clean do nothing unless given -f,\n-\t-i or -n. Defaults to true.\n+\t-i, or -n. Defaults to true.\ndiff --git a/Documentation/config/color.txt b/Documentation/config/color.txt\nindex 1795b2d16be..2f2275ac697 100644\n--- a/Documentation/config/color.txt\n+++ b/Documentation/config/color.txt\n@@ -106,7 +106,7 @@ color.grep.::\n \tmatching text in context lines\n `matchSelected`;;\n \tmatching text in selected lines. Also, used to customize the following\n-\tlinkgit:git-log[1] subcommands: `--grep`, `--author` and `--committer`.\n+\tlinkgit:git-log[1] subcommands: `--grep`, `--author`, and `--committer`.\n `selected`;;\n \tnon-matching text in selected lines. Also, used to customize the\n \tfollowing linkgit:git-log[1] subcommands: `--grep`, `--author` and\ndiff --git a/Documentation/config/credential.txt b/Documentation/config/credential.txt\nindex 075ef8c9750..0221c3e620d 100644\n--- a/Documentation/config/credential.txt\n+++ b/Documentation/config/credential.txt\n@@ -21,7 +21,7 @@ credential.username::\n \n credential..*::\n \tAny of the credential.* options above can be applied selectively to\n-\tsome credentials. For example \"credential.https://example.com.username\"\n+\tsome credentials. For example, \"credential.https://example.com.username\"\n \twould set the default username only for https connections to\n \texample.com. See linkgit:gitcredentials[7] for details on how URLs are\n \tmatched.\ndiff --git a/Documentation/config/fastimport.txt b/Documentation/config/fastimport.txt\nindex c1166e330d5..903677d7efe 100644\n--- a/Documentation/config/fastimport.txt\n+++ b/Documentation/config/fastimport.txt\n@@ -1,8 +1,8 @@\n fastimport.unpackLimit::\n \tIf the number of objects imported by linkgit:git-fast-import[1]\n \tis below this limit, then the objects will be unpacked into\n-\tloose object files. However if the number of imported objects\n-\tequals or exceeds this limit then the pack will be stored as a\n+\tloose object files. However, if the number of imported objects\n+\tequals or exceeds this limit, then the pack will be stored as a\n \tpack. Storing the pack from a fast-import can make the import\n \toperation complete faster, especially on slow filesystems. If\n \tnot set, the value of `transfer.unpackLimit` is used instead.\ndiff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt\nindex 2384c8c94d6..8e9e508933f 100644\n--- a/Documentation/config/fsck.txt\n+++ b/Documentation/config/fsck.txt\n@@ -13,10 +13,10 @@ The rest of the documentation discusses `fsck.*` for brevity, but the\n same applies for the corresponding `receive.fsck.*` and\n `fetch.fsck.*`. variables.\n +\n-Unlike variables like `color.ui` and `core.editor` the\n+Unlike variables like `color.ui` and `core.editor`, the\n `receive.fsck.` and `fetch.fsck.` variables will not\n fall back on the `fsck.` configuration if they aren't set. To\n-uniformly configure the same fsck settings in different circumstances\n+uniformly configure the same fsck settings in different circumstances,\n all three of them must be set to the same values.\n +\n When `fsck.` is set, errors can be switched to warnings and\n@@ -43,12 +43,12 @@ values of ``.\n fsck.skipList::\n \tThe path to a list of object names (i.e. one unabbreviated SHA-1 per\n \tline) that are known to be broken in a non-fatal way and should\n-\tbe ignored. On versions of Git 2.20 and later comments ('#'), empty\n+\tbe ignored. On versions of Git 2.20 and later, comments ('#'), empty\n \tlines, and any leading and trailing whitespace are ignored. Everything\n \tbut a SHA-1 per line will error out on older versions.\n +\n This feature is useful when an established project should be accepted\n-despite early commits containing errors that can be safely ignored\n+despite early commits containing errors that can be safely ignored,\n such as invalid committer email addresses. Note: corrupt objects\n cannot be skipped with this setting.\n +\n@@ -58,7 +58,7 @@ Like `fsck.` this variable has corresponding\n Unlike variables like `color.ui` and `core.editor` the\n `receive.fsck.skipList` and `fetch.fsck.skipList` variables will not\n fall back on the `fsck.skipList` configuration if they aren't set. To\n-uniformly configure the same fsck settings in different circumstances\n+uniformly configure the same fsck settings in different circumstances,\n all three of them must be set to the same values.\n +\n Older versions of Git (before 2.20) documented that the object names\ndiff --git a/Documentation/config/log.txt b/Documentation/config/log.txt\nindex 6e04fbe4f48..9003a821914 100644\n--- a/Documentation/config/log.txt\n+++ b/Documentation/config/log.txt\n@@ -9,7 +9,7 @@ log.date::\n \t`--date` option. See linkgit:git-log[1] for details.\n +\n If the format is set to \"auto:foo\" and the pager is in use, format\n-\"foo\" will be used for the date format. Otherwise \"default\" will\n+\"foo\" will be used for the date format. Otherwise, \"default\" will\n be used.\n \n log.decorate::\ndiff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt\nindex 99e83dd36e5..8851b6cedef 100644\n--- a/Documentation/config/merge.txt\n+++ b/Documentation/config/merge.txt\n@@ -7,7 +7,7 @@ merge.conflictStyle::\n \tmarker and the original text before the `=======` marker. The\n \t\"merge\" style tends to produce smaller conflict regions than diff3,\n \tboth because of the exclusion of the original text, and because\n-\twhen a subset of lines match on the two sides they are just pulled\n+\twhen a subset of lines match on the two sides, they are just pulled\n \tout of the conflict region. Another alternate style, \"zdiff3\", is\n \tsimilar to diff3 but removes matching lines on the two sides from\n \tthe conflict region when those matching lines appear near either\ndiff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt\nindex fe4ba0271b5..294f61efd12 100644\n--- a/Documentation/config/mergetool.txt\n+++ b/Documentation/config/mergetool.txt\n@@ -22,8 +22,8 @@ mergetool..trustExitCode::\n \tFor a custom merge command, specify whether the exit code of\n \tthe merge command can be used to determine whether the merge was\n \tsuccessful. If this is not set to true then the merge target file\n-\ttimestamp is checked and the merge is assumed to have been successful\n-\tif the file has been updated, otherwise the user is prompted to\n+\ttimestamp is checked, and the merge is assumed to have been successful\n+\tif the file has been updated; otherwise, the user is prompted to\n \tindicate the success of the merge.\n \n mergetool.meld.hasOutput::\n@@ -37,7 +37,7 @@ mergetool.meld.hasOutput::\n \n mergetool.meld.useAutoMerge::\n \tWhen the `--auto-merge` is given, meld will merge all non-conflicting\n-\tparts automatically, highlight the conflicting parts and wait for\n+\tparts automatically, highlight the conflicting parts, and wait for\n \tuser decision. Setting `mergetool.meld.useAutoMerge` to `true` tells\n \tGit to unconditionally use the `--auto-merge` option with `meld`.\n \tSetting this value to `auto` makes git detect whether `--auto-merge`\n@@ -55,7 +55,7 @@ endif::[]\n \tfor details.\n \n mergetool.hideResolved::\n-\tDuring a merge Git will automatically resolve as many conflicts as\n+\tDuring a merge, Git will automatically resolve as many conflicts as\n \tpossible and write the 'MERGED' file containing conflict markers around\n \tany conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally\n \trepresent the versions of the file from before Git's conflict\n@@ -74,7 +74,7 @@ mergetool.keepTemporaries::\n \tWhen invoking a custom merge tool, Git uses a set of temporary\n \tfiles to pass to the tool. If the tool returns an error and this\n \tvariable is set to `true`, then these temporary files will be\n-\tpreserved, otherwise they will be removed after the tool has\n+\tpreserved; otherwise, they will be removed after the tool has\n \texited. Defaults to `false`.\n \n mergetool.writeToTemp::\ndiff --git a/Documentation/config/push.txt b/Documentation/config/push.txt\nindex dbaf930f01b..0acbbea18a3 100644\n--- a/Documentation/config/push.txt\n+++ b/Documentation/config/push.txt\n@@ -67,7 +67,7 @@ new default).\n --\n \n push.followTags::\n-\tIf set to true enable `--follow-tags` option by default. You\n+\tIf set to true, enable `--follow-tags` option by default. You\n \tmay override this configuration at time of push by specifying\n \t`--no-follow-tags`.\n \ndiff --git a/Documentation/config/sequencer.txt b/Documentation/config/sequencer.txt\nindex b48d532a969..e664eef01d1 100644\n--- a/Documentation/config/sequencer.txt\n+++ b/Documentation/config/sequencer.txt\n@@ -2,4 +2,4 @@ sequence.editor::\n \tText editor used by `git rebase -i` for editing the rebase instruction file.\n \tThe value is meant to be interpreted by the shell when it is used.\n \tIt can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable.\n-\tWhen not configured the default commit message editor is used instead.\n+\tWhen not configured, the default commit message editor is used instead.\ndiff --git a/Documentation/config/splitindex.txt b/Documentation/config/splitindex.txt\nindex afdb186df8b..cfaa29610b5 100644\n--- a/Documentation/config/splitindex.txt\n+++ b/Documentation/config/splitindex.txt\n@@ -3,10 +3,10 @@ splitIndex.maxPercentChange::\n \tpercent of entries the split index can contain compared to the\n \ttotal number of entries in both the split index and the shared\n \tindex before a new shared index is written.\n-\tThe value should be between 0 and 100. If the value is 0 then\n-\ta new shared index is always written, if it is 100 a new\n+\tThe value should be between 0 and 100. If the value is 0, then\n+\ta new shared index is always written; if it is 100, a new\n \tshared index is never written.\n-\tBy default the value is 20, so a new shared index is written\n+\tBy default, the value is 20, so a new shared index is written\n \tif the number of entries in the split index would be greater\n \tthan 20 percent of the total number of entries.\n \tSee linkgit:git-update-index[1].\ndiff --git a/Documentation/config/user.txt b/Documentation/config/user.txt\nindex c1347fa7bcd..2ffc38d1647 100644\n--- a/Documentation/config/user.txt\n+++ b/Documentation/config/user.txt\n@@ -8,11 +8,11 @@ committer.email::\n \tup in the `author` and `committer` fields of commit\n \tobjects.\n \tIf you need the `author` or `committer` to be different, the\n-\t`author.name`, `author.email`, `committer.name` or\n+\t`author.name`, `author.email`, `committer.name`, or\n \t`committer.email` variables can be set.\n \tAll of these can be overridden by the `GIT_AUTHOR_NAME`,\n \t`GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`,\n-\t`GIT_COMMITTER_EMAIL` and `EMAIL` environment variables.\n+\t`GIT_COMMITTER_EMAIL`, and `EMAIL` environment variables.\n +\n Note that the `name` forms of these variables conventionally refer to\n some form of a personal name. See linkgit:git-commit[1] and the\ndiff --git a/Documentation/config/versionsort.txt b/Documentation/config/versionsort.txt\nindex 0d66617f59f..0cff0908193 100644\n--- a/Documentation/config/versionsort.txt\n+++ b/Documentation/config/versionsort.txt\n@@ -19,7 +19,7 @@ with those suffixes. E.g. if \"-pre\" appears before \"-rc\" in the\n configuration, then all \"1.0-preX\" tags will be listed before any\n \"1.0-rcX\" tags. The placement of the main release tag relative to tags\n with various suffixes can be determined by specifying the empty suffix\n-among those other suffixes. E.g. if the suffixes \"-rc\", \"\", \"-ck\" and\n+among those other suffixes. E.g. if the suffixes \"-rc\", \"\", \"-ck\", and\n \"-bfs\" appear in the configuration in this order, then all \"v4.8-rcX\" tags\n are listed first, followed by \"v4.8\", then \"v4.8-ckX\" and finally\n \"v4.8-bfsX\".\ndiff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt\nindex 988e33de70b..4b5aa5c2e04 100644\n--- a/Documentation/diff-generate-patch.txt\n+++ b/Documentation/diff-generate-patch.txt\n@@ -156,7 +156,7 @@ format, `/dev/null` is used to signal created or deleted\n files.\n +\n However, if the --combined-all-paths option is provided, instead of a\n-two-line from-file/to-file you get an N+1 line from-file/to-file header,\n+two-line from-file/to-file, you get an N+1 line from-file/to-file header,\n where N is the number of parents in the merge commit:\n \n --- a/file\n@@ -197,7 +197,7 @@ added, from the point of view of that parent).\n In the above example output, the function signature was changed\n from both files (hence two `-` removals from both file1 and\n file2, plus `++` to mean one line that was added does not appear\n-in either file1 or file2). Also eight other lines are the same\n+in either file1 or file2). Also, eight other lines are the same\n from file1 but do not appear in file2 (hence prefixed with `+`).\n \n When shown by `git diff-tree -c`, it compares the parents of a\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex 9ee9fa659d2..a1d6633a4f1 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -96,7 +96,7 @@ endif::git-pull[]\n \n -f::\n --force::\n-\tWhen 'git fetch' is used with `:` refspec it may\n+\tWhen 'git fetch' is used with `:` refspec, it may\n \trefuse to update the local branch as discussed\n ifdef::git-pull[]\n \tin the `` part of the linkgit:git-fetch[1]\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 2ada047b6aa..0390dab20f9 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -23,7 +23,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n Splits mail messages in a mailbox into commit log messages,\n-authorship information and patches, and applies them to the\n+authorship information, and patches, and applies them to the\n current branch. You could think of it as a reverse operation\n of linkgit:git-format-patch[1] run on a branch with a straight\n history without merges.\n@@ -134,7 +134,7 @@ include::rerere-options.txt[]\n \tautomatically. This option allows the user to bypass the automatic\n \tdetection and specify the patch format that the patch(es) should be\n \tinterpreted as. Valid formats are mbox, mboxrd,\n-\tstgit, stgit-series and hg.\n+\tstgit, stgit-series, and hg.\n \n -i::\n --interactive::\ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\nindex 95bde308709..9cce68a38be 100644\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -23,8 +23,8 @@ DESCRIPTION\n Reads the supplied diff output (i.e. \"a patch\") and applies it to files.\n When running from a subdirectory in a repository, patched paths\n outside the directory are ignored.\n-With the `--index` option the patch is also applied to the index, and\n-with the `--cached` option the patch is only applied to the index.\n+With the `--index` option, the patch is also applied to the index, and\n+with the `--cached` option, the patch is only applied to the index.\n Without these options, the command applies the patch only to files,\n and does not require them to be in a Git repository.\n \n@@ -52,7 +52,7 @@ OPTIONS\n --summary::\n \tInstead of applying the patch, output a condensed\n \tsummary of information obtained from git diff extended\n-\theaders, such as creations, renames and mode changes.\n+\theaders, such as creations, renames, and mode changes.\n \tTurns off \"apply\".\n \n --check::\n@@ -140,7 +140,7 @@ linkgit:git-config[1]).\n \tapplying a diff generated with `--unified=0`. To bypass these\n \tchecks use `--unidiff-zero`.\n +\n-Note, for the reasons stated above the usage of context-free patches is\n+Note, for the reasons stated above, the usage of context-free patches is\n discouraged.\n \n --apply::\n@@ -161,7 +161,7 @@ discouraged.\n --binary::\n \tHistorically we did not allow binary patch application\n \twithout an explicit permission from the user, and this\n-\tflag was the way to do so. Currently we always allow binary\n+\tflag was the way to do so. Currently, we always allow binary\n \tpatch application, so this is a no-op.\n \n --exclude=::\ndiff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt\nindex 7fea245ed22..cb5a6c8f335 100644\n--- a/Documentation/git-check-attr.txt\n+++ b/Documentation/git-check-attr.txt\n@@ -38,7 +38,7 @@ OPTIONS\n \n --source=::\n \tCheck attributes against the specified tree-ish. It is common to\n-\tspecify the source tree by naming a commit, branch or tag associated\n+\tspecify the source tree by naming a commit, branch, or tag associated\n \twith it.\n \n \\--::\n@@ -60,7 +60,7 @@ unless `-z` is in effect, in which case NUL is used as delimiter:\n \n \n is the path of a file being queried, is an attribute\n-being queried and can be either:\n+being queried, and can be either:\n \n 'unspecified';; when the attribute is not defined for the path.\n 'unset';;\twhen the attribute is defined as false.\ndiff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt\nindex 4e2527612e0..faf8d6ca36f 100644\n--- a/Documentation/git-checkout-index.txt\n+++ b/Documentation/git-checkout-index.txt\n@@ -57,7 +57,7 @@ OPTIONS\n \tNote: --stage=all automatically implies --temp.\n \n --temp::\n-\tInstead of copying the files to the working directory\n+\tInstead of copying the files to the working directory,\n \twrite the content to temporary files. The temporary name\n \tassociations will be written to stdout.\n \ndiff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt\nindex 18f7f86bef3..bf78e314313 100644\n--- a/Documentation/git-diff-files.txt\n+++ b/Documentation/git-diff-files.txt\n@@ -26,7 +26,7 @@ include::diff-options.txt[]\n -2 --ours::\n -3 --theirs::\n -0::\n-\tDiff against the \"base\" version, \"our branch\" or \"their\n+\tDiff against the \"base\" version, \"our branch\", or \"their\n \tbranch\" respectively. With these options, diffs for\n \tmerged entries are not shown.\n +\n@@ -37,7 +37,7 @@ omit diff output for unmerged entries and just show \"Unmerged\".\n -c::\n --cc::\n \tThis compares stage 2 (our branch), stage 3 (their\n-\tbranch) and the working tree file and outputs a combined\n+\tbranch), and the working tree file and outputs a combined\n \tdiff, similar to the way 'diff-tree' shows a merge\n \tcommit with these flags.\n \ndiff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt\nindex a6a054f86d2..bd7b1e0a2ea 100644\n--- a/Documentation/git-fast-import.txt\n+++ b/Documentation/git-fast-import.txt\n@@ -1353,7 +1353,7 @@ the marks back to the source repository, it is easy to verify the\n accuracy and completeness of the import by comparing each Git\n commit to the corresponding source revision.\n \n-Coming from a system such as Perforce or Subversion this should be\n+Coming from a system such as Perforce or Subversion, this should be\n quite simple, as the fast-import mark can also be the Perforce changeset\n number or the Subversion revision number.\n \ndiff --git a/Documentation/git-fsmonitor--daemon.txt b/Documentation/git-fsmonitor--daemon.txt\nindex 65c7b4641e8..8585d19f4d8 100644\n--- a/Documentation/git-fsmonitor--daemon.txt\n+++ b/Documentation/git-fsmonitor--daemon.txt\n@@ -73,7 +73,7 @@ but it will not cause an incorrect result.\n By default, the fsmonitor daemon refuses to work with network-mounted\n repositories; this may be overridden by setting `fsmonitor.allowRemote` to\n `true`. Note, however, that the fsmonitor daemon is not guaranteed to work\n-correctly with all network-mounted repositories and such use is considered\n+correctly with all network-mounted repositories, so such use is considered\n experimental.\n \n On Mac OS, the inter-process communication (IPC) between various Git\n@@ -86,7 +86,7 @@ to work with these filesystems and such use is considered experimental.\n By default, the socket is created in the `.git` directory. However, if the\n `.git` directory is on a network-mounted filesystem, it will instead be\n created at `$HOME/.git-fsmonitor-*` unless `$HOME` itself is on a\n-network-mounted filesystem in which case you must set the configuration\n+network-mounted filesystem, in which case you must set the configuration\n variable `fsmonitor.socketDir` to the path of a directory on a Mac OS native\n filesystem in which to create the socket file.\n \ndiff --git a/Documentation/git-help.txt b/Documentation/git-help.txt\nindex 22dfd780851..7532625a138 100644\n--- a/Documentation/git-help.txt\n+++ b/Documentation/git-help.txt\n@@ -59,7 +59,7 @@ OPTIONS\n \taliases.\n \n --verbose::\n-\tWhen used with `--all` print description for all recognized\n+\tWhen used with `--all`, print description for all recognized\n \tcommands. This is the default.\n \n -c::\n@@ -129,8 +129,8 @@ line option:\n * \"info\" corresponds to '-i|--info',\n * \"web\" or \"html\" correspond to '-w|--web'.\n \n-help.browser, web.browser and browser..path\n-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+help.browser, web.browser, and browser..path\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n The `help.browser`, `web.browser` and `browser..path` will also\n be checked if the 'web' format is chosen (either by command-line\ndiff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt\nindex c0c841b9fdd..ce0d8082125 100644\n--- a/Documentation/git-http-push.txt\n+++ b/Documentation/git-http-push.txt\n@@ -44,7 +44,7 @@ OPTIONS\n -d::\n -D::\n \tRemove from remote repository. The specified branch\n-\tcannot be the remote HEAD. If -d is specified the following\n+\tcannot be the remote HEAD. If -d is specified, the following\n \tother conditions must also be met:\n \n \t- Remote HEAD must resolve to an object that exists locally\ndiff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt\nindex cbc77f72588..5ab957cfbc1 100644\n--- a/Documentation/git-merge-base.txt\n+++ b/Documentation/git-merge-base.txt\n@@ -88,7 +88,7 @@ For example, with this topology:\n \n the merge base between 'A' and 'B' is '1'.\n \n-Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the\n+Given three commits 'A', 'B', and 'C', `git merge-base A B C` will compute the\n merge base between 'A' and a hypothetical commit 'M', which is a merge\n between 'B' and 'C'. For example, with this topology:\n \n@@ -204,7 +204,7 @@ will find B0, and\n \n $ git rebase --onto origin/master $fork_point topic\n \n-will replay D0, D1 and D on top of B to create a new history of this\n+will replay D0, D1, and D on top of B to create a new history of this\n shape:\n \n ....\ndiff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt\nindex 7b7b6f8f344..b9e20c5dcd8 100644\n--- a/Documentation/git-mergetool.txt\n+++ b/Documentation/git-mergetool.txt\n@@ -49,7 +49,7 @@ variable `mergetool..cmd`.\n +\n When 'git mergetool' is invoked with this tool (either through the\n `-t` or `--tool` option or the `merge.tool` configuration\n-variable) the configured command line will be invoked with `$BASE`\n+variable), the configured command line will be invoked with `$BASE`\n set to the name of a temporary file containing the common base for\n the merge, if available; `$LOCAL` set to the name of a temporary\n file containing the contents of the file on the current branch;\n@@ -81,7 +81,7 @@ success of the resolution after the custom tool has exited.\n \n -g::\n --gui::\n-\tWhen 'git-mergetool' is invoked with the `-g` or `--gui` option\n+\tWhen 'git-mergetool' is invoked with the `-g` or `--gui` option,\n \tthe default merge tool will be read from the configured\n \t`merge.guitool` variable instead of `merge.tool`. If\n \t`merge.guitool` is not set, we will fallback to the tool\ndiff --git a/Documentation/git-mv.txt b/Documentation/git-mv.txt\nindex fb0220fd18d..7f991a33802 100644\n--- a/Documentation/git-mv.txt\n+++ b/Documentation/git-mv.txt\n@@ -13,7 +13,7 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Move or rename a file, directory or symlink.\n+Move or rename a file, directory, or symlink.\n \n git mv [-v] [-f] [-n] [-k] \n git mv [-v] [-f] [-n] [-k] ... \ndiff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt\nindex 5c56c870253..d4f1c4d5945 100644\n--- a/Documentation/git-name-rev.txt\n+++ b/Documentation/git-name-rev.txt\n@@ -26,7 +26,7 @@ OPTIONS\n \n --refs=::\n \tOnly use refs whose names match a given shell pattern. The pattern\n-\tcan be one of branch name, tag name or fully qualified ref name. If\n+\tcan be a branch name, a tag name, or a fully qualified ref name. If\n \tgiven multiple times, use refs whose names match any of the given shell\n \tpatterns. Use `--no-refs` to clear any previous ref patterns given.\n \ndiff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt\nindex 6ed71bd0b75..94700b89be9 100644\n--- a/Documentation/git-remote-fd.txt\n+++ b/Documentation/git-remote-fd.txt\n@@ -13,10 +13,10 @@ DESCRIPTION\n -----------\n This helper uses specified file descriptors to connect to a remote Git server.\n This is not meant for end users but for programs and scripts calling git\n-fetch, push or archive.\n+fetch, push, or archive.\n \n If only is given, it is assumed to be a bidirectional socket connected\n-to remote Git server (git-upload-pack, git-receive-pack or\n+to a remote Git server (git-upload-pack, git-receive-pack, or\n git-upload-archive). If both and are given, they are assumed\n to be pipes connected to a remote Git server ( being the inbound pipe\n and being the outbound pipe.\ndiff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.txt\nindex d274002666c..15dcbb6d91c 100644\n--- a/Documentation/git-request-pull.txt\n+++ b/Documentation/git-request-pull.txt\n@@ -16,7 +16,7 @@ DESCRIPTION\n Generate a request asking your upstream project to pull changes into\n their tree. The request, printed to the standard output,\n begins with the branch description, summarizes\n-the changes and indicates from where they can be pulled.\n+the changes, and indicates from where they can be pulled.\n \n The upstream project is expected to have the commit named by\n `` and the output asks it to integrate the changes you made\ndiff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\nindex 4ef0872b463..c771c897707 100644\n--- a/Documentation/git-show-branch.txt\n+++ b/Documentation/git-show-branch.txt\n@@ -125,7 +125,7 @@ OPTIONS\n \tdefault to color output.\n \tSame as `--color=never`.\n \n-Note that --more, --list, --independent and --merge-base options\n+Note that --more, --list, --independent, and --merge-base options\n are mutually exclusive.\n \n \n@@ -144,7 +144,7 @@ otherwise it shows a space. Merge commits are denoted by\n a `-` sign. Each commit shows a short name that\n can be used as an extended SHA-1 to name that commit.\n \n-The following example shows three branches, \"master\", \"fixes\"\n+The following example shows three branches, \"master\", \"fixes\",\n and \"mhf\":\n \n ------------------------------------------------\ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\nindex e030dd75bed..8c47890a6a8 100644\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -160,7 +160,7 @@ you will need to handle the situation manually.\n \n --index-version ::\n \tWrite the resulting index out in the named on-disk format version.\n-\tSupported versions are 2, 3 and 4. The current default version is 2\n+\tSupported versions are 2, 3, and 4. The current default version is 2\n \tor 3, depending on whether extra features are used, such as\n \t`git add -N`. With `--verbose`, also report the version the index\n \tfile uses before and after this command.\ndiff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt\nindex bc65f91310d..3cda2e07c24 100644\n--- a/Documentation/gitdiffcore.txt\n+++ b/Documentation/gitdiffcore.txt\n@@ -231,7 +231,7 @@ like these:\n * -B/60 (the same as above, since diffcore-break defaults to 50%).\n \n Note that earlier implementation left a broken pair as separate\n-creation and deletion patches. This was an unnecessary hack and\n+creation and deletion patches. This was an unnecessary hack, and\n the latest implementation always merges all the broken pairs\n back into modifications, but the resulting patch output is\n formatted differently for easier review in case of such\n@@ -263,7 +263,7 @@ textual diff has an added or a deleted line that matches the given\n regular expression. This means that it will detect in-file (or what\n rename-detection considers the same file) moves, which is noise. The\n implementation runs diff twice and greps, and this can be quite\n-expensive. To speed things up binary files without textconv filters\n+expensive. To speed things up, binary files without textconv filters\n will be ignored.\n \n When `-S` or `-G` are used without `--pickaxe-all`, only filepairs\ndiff --git a/Documentation/gitformat-pack.txt b/Documentation/gitformat-pack.txt\nindex 678a7e4cb49..dd0476a616a 100644\n--- a/Documentation/gitformat-pack.txt\n+++ b/Documentation/gitformat-pack.txt\n@@ -18,7 +18,7 @@ DESCRIPTION\n -----------\n \n The Git pack format is how Git stores most of its primary repository\n-data. Over the lietime of a repository loose objects (if any) and\n+data. Over the lietime of a repository, loose objects (if any) and\n smaller packs are consolidated into larger pack(s). See\n linkgit:git-gc[1] and linkgit:git-pack-objects[1].\n \ndiff --git a/Documentation/technical/api-simple-ipc.txt b/Documentation/technical/api-simple-ipc.txt\nindex b4259098680..c4fb152b232 100644\n--- a/Documentation/technical/api-simple-ipc.txt\n+++ b/Documentation/technical/api-simple-ipc.txt\n@@ -25,7 +25,7 @@ When received, the response is returned back to the caller.\n For example, the `fsmonitor--daemon` feature will be built as a server\n application on top of the IPC-server library routines. It will have\n threads watching for file system events and a thread pool waiting for\n-client connections. Clients, such as `git status` will request a list\n+client connections. Clients, such as `git status`, will request a list\n of file system events since a point in time and the server will\n respond with a list of changed files and directories. The formats of\n the request and response are application-specific; the IPC-client and\n@@ -37,7 +37,7 @@ Comparison with sub-process model\n \n The Simple-IPC mechanism differs from the existing `sub-process.c`\n model (Documentation/technical/long-running-process-protocol.txt) and\n-used by applications like Git-LFS. In the LFS-style sub-process model\n+used by applications like Git-LFS. In the LFS-style sub-process model,\n the helper is started by the foreground process, communication happens\n via a pair of file descriptors bound to the stdin/stdout of the\n sub-process, the sub-process only serves the current foreground\ndiff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.txt\nindex 82d919b2615..dd0b37c4e34 100644\n--- a/Documentation/technical/reftable.txt\n+++ b/Documentation/technical/reftable.txt\n@@ -175,7 +175,7 @@ log_index*\n footer\n ....\n \n-In a log-only file the first log block immediately follows the file\n+In a log-only file, the first log block immediately follows the file\n header, without padding to block alignment.\n \n Block size\n-- \ngitgitgadget\n\n"},{"id":"482827","messageId":"92beac82-f0fd-452b-858f-453cdf21b71f@ramsayjones.plus.com","threadId":"60323","inReplyTo":"fffcf580b29153a3c4c7ead3abfb2b621d3a0d46.1696747529.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 03/25] documentation: fix typos","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2023-10-08T16:32:07Z","receivedAt":"2023-10-08T16:35:15Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\n\nOn 08/10/2023 07:45, Elijah Newren via GitGitGadget wrote:\n[snip]\n> diff --git a/Documentation/gitformat-pack.txt b/Documentation/gitformat-pack.txt\n> index 870e00f2982..42afb953e8c 100644\n> --- a/Documentation/gitformat-pack.txt\n> +++ b/Documentation/gitformat-pack.txt\n> @@ -17,8 +17,8 @@ $GIT_DIR/objects/pack/multi-pack-index\n> DESCRIPTION\n> -----------\n> \n> -The Git pack format is now Git stores most of its primary repository\n> -data. Over the lietime af a repository loose objects (if any) and\n> +The Git pack format is how Git stores most of its primary repository\n> +data. Over the lietime of a repository loose objects (if any) and\n\nHmm, this tyop jumped out at me while this patch\nfloated past... (at least I assume it is a typo!):\n\n s/lietime/lifetime/\n\nATB,\nRamsay Jones\n\n"},{"id":"482842","messageId":"ZSNbALj63zjzOURN@nand.local","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"Re: [PATCH 00/25] Documentation fixes","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2023-10-09T01:44:32Z","receivedAt":"2023-10-09T01:46:59Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Sun, Oct 08, 2023 at 06:45:02AM +0000, Elijah Newren via GitGitGadget wrote:\n> It turns out that AI is pretty good at making small fixes to documentation;\n> certainly not perfect, but it provides quite good signal. Unfortunately,\n> there is a lot to sift through. Some points about my strategy:\n\nQuite interesting ;-).\n\nI'm curious to learn a little bit more about your\nstrategy beyond what you wrote:\n\n - What tool did you use? ChatGPT? Something home-grown?\n - (Assuming this was generated by some sort of LLM): what did you\n prompt it with?\n - What was the output format: the edited text in its entirety, or a\n patch that can be applied on top?\n\nThanks,\nTaylor\n"},{"id":"482875","messageId":"CABPp-BGsg8CnX1EXpeTwtQzEBPA3ZoTmLKGa1d7TqAg4aAB3EA@mail.gmail.com","threadId":"60323","inReplyTo":"ZSNbALj63zjzOURN@nand.local","subject":"Re: [PATCH 00/25] Documentation fixes","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2023-10-09T16:46:21Z","receivedAt":"2023-10-09T16:46:41Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Sun, Oct 8, 2023 at 6:44 PM Taylor Blau wrote:\n>\n> On Sun, Oct 08, 2023 at 06:45:02AM +0000, Elijah Newren via GitGitGadget wrote:\n> > It turns out that AI is pretty good at making small fixes to documentation;\n> > certainly not perfect, but it provides quite good signal. Unfortunately,\n> > there is a lot to sift through. Some points about my strategy:\n>\n> Quite interesting ;-).\n>\n> I'm curious to learn a little bit more about your\n> strategy beyond what you wrote:\n>\n> - What tool did you use? ChatGPT? Something home-grown?\n\nA mixture of gpt-4 and gpt-4-32k (I would have just used gpt-4, but\ntrying to give it a full file blows the token limit on several of\nGit's documentation files).\n\nAlso, it was sent to an internally hosted instance. On this internal\ninstance, it seemed to require passing the\napi-version=2023-03-15-preview parameter. I don't really know what\nthat parameter means, but I suspect it might have been some\n6-months-ish old version of gpt-4?\n\n> - (Assuming this was generated by some sort of LLM): what did you\n> prompt it with?\n\nNote that it was exactly one file per prompt, which was as follows:\n\n\"\"\"\nFor the asciidoc file below, are there any typos, grammatical errors,\nor wording problems? If so, please highlight them along with proposed\ncorrections:\n\n--------------------\n${FILE_CONTENTS}\n\"\"\"\n\nIf I had to do it over, I'd be much more explicit about the output\nformat. Probably, \"Please respond by outputting the full file, with\nany corrections included. If there are no corrections, simply output\nthe original file as-is.\" which would allow me to simply diff the\noutput and look at the changes.\n\nAlso, I would probably specify that \"The ascii doc file starts three\nlines below, just after the line of dashes\", hoping that would help it\navoid sometimes presuming that the dashes were part of the file.\n\n> - What was the output format: the edited text in its entirety, or a\n> patch that can be applied on top?\n\nMy wording was unfortunately vague, so I sometimes got human prose\ninstructing me with a change to make, sometimes I got a bulleted list\nin the form \"${old_text} -> ${new_text}\", but most of the time it\nprinted the file (or a subset thereof) with corrections. I also had\nall the output concatenated into one large file, which made it \"fun\"\nto work through all the changes. Even when diffing files, I manually\napplied any changes I saw to the actual file (which did risk\nintroducing new typos, and missing some of the corrections, but did\nensure I reviewed everything).\n\nAlso, not only did I get different output formats, but there were many\ntimes the file was cut off at some point. I sometimes assumed that\njust meant there were no changes outside that region, but there were\ntimes where there was only one change and it had given me hundreds of\nlines of context around it before it cut off, so it did leave me with\nthe feeling it might have only processed or responded to part of the\nfile.\n\nThere were also several times where the changes it suggested were a\nno-op, making me wonder if it just failed or something -- I looked at\nit really closely (including sometimes piping the output through xxd,\nand thus once noticed a change of tab-after-period to\nspace-after-period), but when it was responding with human prose and\nsaid something like \"Change the sentence that reads '${old_version}'\n-> '${old_version}', it made me wonder if something just went haywire\nwith the LLM and I should retry.\n\nHowever, despite the above issues making me think there are more\ndocumentation issues to be found with an LLM, I didn't re-check any\nfiles unless I got an error with no output (e.g. excessive number of\ntokens, or I've hit rate limits on using the API). I didn't bother,\nbecause the firehose of changes it provided me even without those\ncaveats was far more than enough to deal with.\n"},{"id":"482896","messageId":"xmqqbkd7zkki.fsf@gitster.g","threadId":"60323","inReplyTo":"92beac82-f0fd-452b-858f-453cdf21b71f@ramsayjones.plus.com","subject":"Re: [PATCH 03/25] documentation: fix typos","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-10-09T19:01:49Z","receivedAt":"2023-10-09T19:02:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramsay Jones writes:\n\n> On 08/10/2023 07:45, Elijah Newren via GitGitGadget wrote:\n> [snip]\n>> diff --git a/Documentation/gitformat-pack.txt b/Documentation/gitformat-pack.txt\n>> index 870e00f2982..42afb953e8c 100644\n>> --- a/Documentation/gitformat-pack.txt\n>> +++ b/Documentation/gitformat-pack.txt\n>> @@ -17,8 +17,8 @@ $GIT_DIR/objects/pack/multi-pack-index\n>> DESCRIPTION\n>> -----------\n>> \n>> -The Git pack format is now Git stores most of its primary repository\n>> -data. Over the lietime af a repository loose objects (if any) and\n>> +The Git pack format is how Git stores most of its primary repository\n>> +data. Over the lietime of a repository loose objects (if any) and\n>\n> Hmm, this tyop jumped out at me while this patch\n> floated past... (at least I assume it is a typo!):\n>\n> s/lietime/lifetime/\n>\n> ATB,\n> Ramsay Jones\n\nThanks, will squash in.\n"},{"id":"482945","messageId":"CABPp-BGGj1tfAEtjuS-O6pMK-BfdKb=RZDenuoppLADbFXHcfQ@mail.gmail.com","threadId":"60323","inReplyTo":"92beac82-f0fd-452b-858f-453cdf21b71f@ramsayjones.plus.com","subject":"Re: [PATCH 03/25] documentation: fix typos","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2023-10-10T00:57:50Z","receivedAt":"2023-10-10T00:58:09Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Sun, Oct 8, 2023 at 9:32 AM Ramsay Jones wrote:\n>\n> On 08/10/2023 07:45, Elijah Newren via GitGitGadget wrote:\n> [snip]\n> > diff --git a/Documentation/gitformat-pack.txt b/Documentation/gitformat-pack.txt\n> > index 870e00f2982..42afb953e8c 100644\n> > --- a/Documentation/gitformat-pack.txt\n> > +++ b/Documentation/gitformat-pack.txt\n> > @@ -17,8 +17,8 @@ $GIT_DIR/objects/pack/multi-pack-index\n> > DESCRIPTION\n> > -----------\n> >\n> > -The Git pack format is now Git stores most of its primary repository\n> > -data. Over the lietime af a repository loose objects (if any) and\n> > +The Git pack format is how Git stores most of its primary repository\n> > +data. Over the lietime of a repository loose objects (if any) and\n>\n> Hmm, this tyop jumped out at me while this patch\n> floated past... (at least I assume it is a typo!):\n>\n> s/lietime/lifetime/\n\nOh, that's interesting. I wonder if the LLM did fix that, and I just\ndidn't notice it. I suspect so.\n\nAnyway, thanks for catching! It looks like Junio manually squashed it\nin, but I've also got it locally in case any other changes are pointed\nout and I need to re-roll.\n"},{"id":"483321","messageId":"xmqqo7gykzcy.fsf@gitster.g","threadId":"60323","inReplyTo":"pull.1595.git.1696747527.gitgitgadget@gmail.com","subject":"Re: [PATCH 00/25] Documentation fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-10-16T21:54:05Z","receivedAt":"2023-10-16T21:54:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Elijah Newren via GitGitGadget\" writes:\n\n> I did review every single change here, multiple times, and I have tried to\n> split up this series in a way to make it easier to review. In particular I:\n> ...\n> (Note: every patch in this series, except for the whitespace fixes patch,\n> are best viewed with --color-words.)\n\nI didn't think of anything clever, so ended up reading a bit by bit\nover days. I didn't find anything glaringly wrong ;-)\n\nLet's mark it for 'next'.\n\nThanks.\n"}]}