diff options
| author | Elijah Newren <newren@gmail.com> | 2026-04-16 23:36:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-04-16 21:22:01 -0700 |
| commit | e8955061076952cc5eab0300424fc48b601fe12d (patch) | |
| tree | c51af48af95e5829dfc160cb8b697c3f611adc69 | |
| parent | 60e8015d233a2431e75dcb832dcd5be5368ae452 (diff) | |
| download | git-master.tar.gz git-master.zip | |
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>
| -rw-r--r-- | Documentation/config/submodule.adoc | 2 | ||||
| -rw-r--r-- | 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 |