doc: fix grammar errors in submodule description
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Apr 16, 2026 at 23:36 UTC
e8955061076952cc5eab0300424fc48b601fe12d
2 files changed
+5
-5
Documentation/config/submodule.adoc
+1
-1
@@ -40,7 +40,7 @@ submodule.<name>.ignore::
40
takes only differences between the HEAD of the submodule and the commit
41
recorded in the superproject into account. "untracked" will additionally
42
let submodules with modified tracked files in their work tree show up.
43
- When set to "none"(default) It also show submodules as changed if they have
43
+ When set to "none" (default) it also shows submodules as changed if they have
44
untracked files in their work tree.
45
This setting overrides any setting made in .gitmodules for this submodule,
46
both settings can be overridden on the command line by using the
Documentation/gitmodules.adoc
+4
-4
@@ -70,10 +70,10 @@ submodule.<name>.ignore::
70
--
71
all;; The submodule will never be considered modified (but will
72
nonetheless show up in the output of status and commit when it has
73
- been staged). Add `(new commits)` can be overruled using the
74
- `git add --force <submodule.path>`.
75
- The setting affects `status`, `update-index`, `diff` and `log`(due
76
- to underlaying `diff`).
73
+ been staged). Adding a submodule with `(new commits)` can be
74
+ overridden using `git add --force <submodule.path>`.
75
+ This setting affects `status`, `update-index`, `diff` and `log`
76
+ (due to underlying `diff`).
77
78
dirty;; All changes to the submodule's work tree will be ignored, only
79
committed differences between the `HEAD` of the submodule and its