summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-09 05:29:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-09 05:29:52 (GMT)
commit0ae496ccd85e121c01bddfdfc1a68aced04f79ff (patch)
treee9424a35724cc8fda37ee82b5d72c8e6e4910aa3 /Documentation
parent6e79a8858560a3a3e2b5e092a6cbdd5f3f1ad13b (diff)
parentd4264ca3233e206ea927bc94befda530683b5836 (diff)
downloadgit-0ae496ccd85e121c01bddfdfc1a68aced04f79ff.zip
git-0ae496ccd85e121c01bddfdfc1a68aced04f79ff.tar.gz
git-0ae496ccd85e121c01bddfdfc1a68aced04f79ff.tar.bz2
Merge branch 'ml/submodule-add-existing'
* ml/submodule-add-existing: git-submodule - Allow adding a submodule in-place
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-submodule.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index e818e6e..b4d0160 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -18,8 +18,9 @@ COMMANDS
--------
add::
Add the given repository as a submodule at the given path
- to the changeset to be committed next. In particular, the
- repository is cloned at the specified path, added to the
+ to the changeset to be committed next. If path is a valid
+ repository within the project, it is added as is. Otherwise,
+ repository is cloned at the specified path. path is added to the
changeset and registered in .gitmodules. If no path is
specified, the path is deduced from the repository specification.
If the repository url begins with ./ or ../, it is stored as