diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:06:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:06:25 -0700 |
| commit | 849865733fc667789d0e57edd1ac2ee1f38499a3 (patch) | |
| tree | f2507a5c015a48669914438e6c92e37850a336d9 /Documentation | |
| parent | aa57328d60f5d5a5f74d1d336caf06b6bdf4fd03 (diff) | |
| parent | 31991b0260216d16f2e447e68bcabd9d9cce26ba (diff) | |
| download | git-849865733fc667789d0e57edd1ac2ee1f38499a3.tar.gz git-849865733fc667789d0e57edd1ac2ee1f38499a3.tar.xz | |
Merge branch 'ab/submodule-add-f'
* ab/submodule-add-f:
git submodule: add submodules with git add -f <path>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-submodule.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index cdabfd29a..76a832a3a 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -95,6 +95,10 @@ is the superproject and submodule repositories will be kept together in the same relative location, and only the superproject's URL needs to be provided: git-submodule will correctly locate the submodule using the relative URL in .gitmodules. ++ +The submodule will be added with "git add --force <path>". I.e. git +doesn't care if the new path is in a `gitignore`. Your invocation of +"git submodule add" is considered enough to override it. status:: Show the status of the submodules. This will print the SHA-1 of the |