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/gitmodules.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/gitmodules.adoc')
| -rw-r--r-- | Documentation/gitmodules.adoc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/gitmodules.adoc b/Documentation/gitmodules.adoc index d9bec8b187..3792da96aa 100644 --- a/Documentation/gitmodules.adoc +++ b/Documentation/gitmodules.adoc @@ -70,7 +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). + 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`). dirty;; All changes to the submodule's work tree will be ignored, only committed differences between the `HEAD` of the submodule and its |