diff options
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 |