File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -77,7 +77,9 @@ in linkgit:gitglossary[7].
7777
7878`-f` ::
7979`--force` ::
80- Allow adding otherwise ignored files.
80+ Allow adding otherwise ignored files. The option is also used
81+ when updating submodules and `submodule.<name>.ignore=all`
82+ is set. The `path` to the submodule must be explicitly specified.
8183
8284`--sparse` ::
8385 Allow updating index entries outside of the sparse-checkout cone.
Original file line number Diff line number Diff line change @@ -70,7 +70,10 @@ submodule.<name>.ignore::
7070--
7171 all;; The submodule will never be considered modified (but will
7272 nonetheless show up in the output of status and commit when it has
73- been staged).
73+ been staged). Add `(new commits)` can be overruled using the
74+ `git add --force <submodule.path>` similar to ignored files. The setting has effect
75+ for `status` , `update-index` , `diff` and `log` (due to underlaying
76+ `diff` )
7477
7578 dirty;; All changes to the submodule's work tree will be ignored, only
7679 committed differences between the `HEAD` of the submodule and its
You can’t perform that action at this time.
0 commit comments