summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-03-08 21:29:52 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-08 21:29:52 -0800
commit0ae496ccd85e121c01bddfdfc1a68aced04f79ff (patch)
treee9424a35724cc8fda37ee82b5d72c8e6e4910aa3 /Documentation
parentMerge branch 'mr/compat-snprintf' (diff)
parentgit-submodule - Allow adding a submodule in-place (diff)
downloadtgif-0ae496ccd85e121c01bddfdfc1a68aced04f79ff.tar.xz
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 e818e6e789..b4d01605a5 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