diff options
| author | Claus Schneider(Eficode) <claus.schneider@eficode.com> | 2026-02-06 13:23:00 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-06 09:43:26 -0800 |
| commit | 6cc6d1b4c699323bc2a76e1a4cfbaede242cbfc8 (patch) | |
| tree | ff9e1ebc884641bbb6dd81c2c29fa2657537debd /Documentation/config/submodule.adoc | |
| parent | 902013225cb7120c59b6ef8771db5c266041f6d5 (diff) | |
| download | git-6cc6d1b4c699323bc2a76e1a4cfbaede242cbfc8.tar.xz | |
Documentation: update add --force option + ignore=all config
- git-add.adoc: Update the --force documentation for submodule behaviour
to be added even the given configuration ignore=all.
- gitmodules.adoc and config/submodule.adoc: The submodule config
ignore=all now need --force in order to update the index.
Signed-off-by: Claus Schneider(Eficode) <claus.schneider@eficode.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/submodule.adoc')
| -rw-r--r-- | Documentation/config/submodule.adoc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/config/submodule.adoc b/Documentation/config/submodule.adoc index 0672d99117..b3db1dc2c8 100644 --- a/Documentation/config/submodule.adoc +++ b/Documentation/config/submodule.adoc @@ -32,15 +32,16 @@ submodule.<name>.fetchRecurseSubmodules:: submodule.<name>.ignore:: Defines under what circumstances "git status" and the diff family show - a submodule as modified. When set to "all", it will never be considered - modified (but it will nonetheless show up in the output of status and - commit when it has been staged), "dirty" will ignore all changes - to the submodule's work tree and + a submodule as modified. + When set to "all" will never consider the submodule modified. It can + nevertheless be staged using the option --force and it will then show up + in the output of status. + When set to "dirty" will ignore all changes to the submodule's work tree and 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. - Using "none" (the default when this option is not set) also shows - submodules that have untracked files in their work tree as changed. + When set to "none"(default) It also show 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 "--ignore-submodules" option. The 'git submodule' commands are not |