[PATCH 5/5] Documentation: update add --force and submodule ignore=all config
From: "Claus Schneider(Eficode)" <claus.schneider@eficode.com>
- The add --force doc: append additionel info about the submodule
functionality.
- The submodule config ignore=all now need --force in order to update
the index.
Signed-off-by: Claus Schneider(Eficode) <claus.schneider@eficode.com>
---
Documentation/git-add.adoc | 4 +++-
Documentation/gitmodules.adoc | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-add.adoc b/Documentation/git-add.adoc
index b7a735824d..2234b1e846 100644
--- a/Documentation/git-add.adoc
+++ b/Documentation/git-add.adoc
@@ -77,7 +77,9 @@ in linkgit:gitglossary[7].
`-f`::
`--force`::
- Allow adding otherwise ignored files.
+ Allow adding otherwise ignored files. The option is also used
+ when updating submodules and `submodule.<name>.ignore=all`
+ is set. The `path` to the submodule must be explicitly specified.
`--sparse`::
Allow updating index entries outside of the sparse-checkout cone.
diff --git a/Documentation/gitmodules.adoc b/Documentation/gitmodules.adoc
index d9bec8b187..3aa71170ee 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>` similar to ignored files. The setting has effect
+ for `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
--
gitgitgadget