summaryrefslogtreecommitdiff
path: root/Documentation/git-submodule.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-15 19:06:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-15 19:06:25 (GMT)
commit849865733fc667789d0e57edd1ac2ee1f38499a3 (patch)
treef2507a5c015a48669914438e6c92e37850a336d9 /Documentation/git-submodule.txt
parentaa57328d60f5d5a5f74d1d336caf06b6bdf4fd03 (diff)
parent31991b0260216d16f2e447e68bcabd9d9cce26ba (diff)
downloadgit-849865733fc667789d0e57edd1ac2ee1f38499a3.zip
git-849865733fc667789d0e57edd1ac2ee1f38499a3.tar.gz
git-849865733fc667789d0e57edd1ac2ee1f38499a3.tar.bz2
Merge branch 'ab/submodule-add-f'
* ab/submodule-add-f: git submodule: add submodules with git add -f <path>
Diffstat (limited to 'Documentation/git-submodule.txt')
-rw-r--r--Documentation/git-submodule.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index cdabfd2..76a832a 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