From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>, Elijah Newren <newren@gmail.com>
Subject: [PATCH 6/6] doc: fix grammar errors in submodule description
Date: Thu, 16 Apr 2026 23:36:31 +0000 [thread overview]
Message-ID: <5ec9a3d20f0bda5a8c5f518b93b288d5d618406f.1776382591.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2092.git.1776382591.gitgitgadget@gmail.com>
From: Elijah Newren <newren@gmail.com>
6cc6d1b4c699 (Documentation: update add --force option + ignore=all
config, 2026-02-06) added text describing both the ignore=none and
ignore=all behaviors. The former had minor formatting and grammatical
errors, while the latter was a bit garbled. I have tried to tweak the
wording on the latter to make it read as I think was intended, and fixed
the minor grammatical issues with both as well.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
Documentation/config/submodule.adoc | 2 +-
Documentation/gitmodules.adoc | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/config/submodule.adoc b/Documentation/config/submodule.adoc
index 8dacb852c7..4c424017b4 100644
--- a/Documentation/config/submodule.adoc
+++ b/Documentation/config/submodule.adoc
@@ -40,7 +40,7 @@ submodule.<name>.ignore::
takes only differences between the HEAD of the submodule and the commit
recorded in the superproject into account. "untracked" will additionally
let submodules with modified tracked files in their work tree show up.
- When set to "none"(default) It also show submodules as changed if they have
+ When set to "none" (default) it also shows submodules as changed if they have
untracked files in their work tree.
This setting overrides any setting made in .gitmodules for this submodule,
both settings can be overridden on the command line by using the
diff --git a/Documentation/gitmodules.adoc b/Documentation/gitmodules.adoc
index 3792da96aa..fd96639806 100644
--- a/Documentation/gitmodules.adoc
+++ b/Documentation/gitmodules.adoc
@@ -70,10 +70,10 @@ submodule.<name>.ignore::
--
all;; The submodule will never be considered modified (but will
nonetheless show up in the output of status and commit when it has
- been staged). Add `(new commits)` can be overruled using the
- `git add --force <submodule.path>`.
- The setting affects `status`, `update-index`, `diff` and `log`(due
- to underlaying `diff`).
+ been staged). Adding a submodule with `(new commits)` can be
+ overridden using `git add --force <submodule.path>`.
+ This setting affects `status`, `update-index`, `diff` and `log`
+ (due to underlying `diff`).
dirty;; All changes to the submodule's work tree will be ignored, only
committed differences between the `HEAD` of the submodule and its
--
gitgitgadget
prev parent reply other threads:[~2026-04-16 23:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-16 23:36 [PATCH 0/6] Documentation fixes for changes made this cycle Elijah Newren via GitGitGadget
2026-04-16 23:36 ` [PATCH 1/6] RelNotes/2.54.0: fix typos and grammar Elijah Newren via GitGitGadget
2026-04-16 23:36 ` [PATCH 2/6] CodingGuidelines: fix subject-verb agreement Elijah Newren via GitGitGadget
2026-04-16 23:36 ` [PATCH 3/6] doc: fix self-referential config in sendemail.smtpSSLClientKey Elijah Newren via GitGitGadget
2026-04-16 23:36 ` [PATCH 4/6] doc: fix plural agreement in pack.preferBitmapTips Elijah Newren via GitGitGadget
2026-04-16 23:36 ` [PATCH 5/6] doc: fix singular/plural mismatch in git-rerere Elijah Newren via GitGitGadget
2026-04-16 23:36 ` Elijah Newren via GitGitGadget [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5ec9a3d20f0bda5a8c5f518b93b288d5d618406f.1776382591.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox