Jens Lehmann 73b0898d0d Teach "git submodule add" the --name option ... "git submodule add" initializes the name of a submodule to its path. This was ok as long as the .git directory lived inside the submodule's work tree, but since 1.7.8 it is stored in the .git/modules/<name> directory of the superproject, making the submodule name survive the removal of the submodule's work tree. This leads to problems when the user tries to add a different submodule at the same path - and thus the same name - later, as that will happily try to restore the submodule from the old repository instead of the one the user specified and will lead to a checkout of the wrong repository. Add the new "--name" option to let the user provide a name for the submodule. This enables the user to solve this conflict without having to remove .git/modules/<name> by hand (which is no viable solution as it makes it impossible to checkout a commit that records the old submodule and populate it, as that will still check out the new submodule for the same reason). To achieve that the submodule's name is added to the parameter list of the module_clone() helper function. This makes it possible to remove the call of module_name() there because both callers of module_clone() already know the name and can provide it as argument number two. Reported-by: Jonathan Johnson <me@jondavidjohn.com> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2012-09-29 21:49:11 -07:00
..
howto	correct spelling: an URL -> a URL	2012-03-28 08:47:23 -07:00
pt_BR
RelNotes	Update draft release notes to 1.8.0	2012-09-25 10:44:32 -07:00
technical	Merge branch 'dj/fetch-all-tags' into maint	2012-09-24 12:39:21 -07:00
.gitattributes
.gitignore
asciidoc.conf	Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11	2012-09-11 11:08:40 -07:00
blame-options.txt
build-docdep.perl
cat-texi.perl
cmd-list.perl
CodingGuidelines	Documentation/CodingGuidelines: spell out more shell guidelines	2012-08-15 11:00:39 -07:00
config.txt	Merge branch 'maint'	2012-09-17 15:59:34 -07:00
date-formats.txt
diff-config.txt	Documentation: spelling fixes	2012-06-19 11:35:19 -07:00
diff-format.txt
diff-generate-patch.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
diff-options.txt	Documentation: Fix misspellings	2012-06-22 14:25:04 -07:00
docbook-xsl.css
docbook.xsl
everyday.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
fetch-options.txt	Doc: shallow clone deepens _to_ new depth	2012-09-18 21:47:12 -07:00
fix-texi.perl
git-add.txt	Doc add: link gitignore	2012-09-18 21:49:46 -07:00
git-am.txt	Merge branch 'jb/am-include'	2012-04-20 15:49:16 -07:00
git-annotate.txt
git-apply.txt	apply: document --3way option	2012-07-09 14:40:03 -07:00
git-archimport.txt
git-archive.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-bisect-lk2009.txt
git-bisect.txt
git-blame.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-branch.txt	Merge branch 'po/maint-docs'	2012-09-25 10:39:52 -07:00
git-bundle.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-cat-file.txt
git-check-attr.txt
git-check-ref-format.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-checkout-index.txt
git-checkout.txt	Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11	2012-09-14 20:45:03 -07:00
git-cherry-pick.txt	Merge branch 'cw/cherry-pick-allow-empty-message'	2012-09-03 15:53:37 -07:00
git-cherry.txt
git-citool.txt
git-clean.txt	Doc clean: add See Also link	2012-09-18 21:49:50 -07:00
git-clone.txt	clone: allow --no-local to turn off local optimizations	2012-05-30 09:51:22 -07:00
git-column.txt	Documentation: spelling fixes	2012-06-19 11:35:19 -07:00
git-commit-tree.txt	Revert "git-commit-tree(1): update synopsis"	2012-07-17 13:11:03 -07:00
git-commit.txt	Documentation: describe subject more precisely	2012-09-13 21:30:21 -07:00
git-config.txt	Sync with 1.7.11.6	2012-09-11 11:23:54 -07:00
git-count-objects.txt
git-credential-cache--daemon.txt	command-list: mention git-credential-* helpers	2012-08-08 12:11:54 -07:00
git-credential-cache.txt	command-list: mention git-credential-* helpers	2012-08-08 12:11:54 -07:00
git-credential-store.txt	command-list: mention git-credential-* helpers	2012-08-08 12:11:54 -07:00
git-credential.txt	Documentation: list git-credential in plumbing commands	2012-08-08 09:59:17 -07:00
git-cvsexportcommit.txt
git-cvsimport.txt
git-cvsserver.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-daemon.txt	Merge branch 'jc/daemon-access-hook'	2012-09-03 15:54:03 -07:00
git-describe.txt	Documentation: do not mention .git/refs/* directories	2012-08-06 14:04:16 -07:00
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt
git-diff.txt
git-difftool.txt	mergetool,difftool: Document --tool-help consistently	2012-08-10 08:07:41 -07:00
git-fast-export.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-fast-import.txt	Merge branch 'er/doc-fast-import-done' into maint	2012-09-18 14:33:52 -07:00
git-fetch-pack.txt	fetch-pack: new --stdin option to read refs from stdin	2012-04-02 13:47:15 -07:00
git-fetch.txt
git-filter-branch.txt	Documentation/git-filter-branch: Move note about effect of removing commits	2012-09-18 12:51:58 -07:00
git-fmt-merge-msg.txt
git-for-each-ref.txt	Documentation: describe subject more precisely	2012-09-13 21:30:21 -07:00
git-format-patch.txt	Documentation: describe subject more precisely	2012-09-13 21:30:21 -07:00
git-fsck-objects.txt
git-fsck.txt	Merge branch 'jc/tag-doc' into maint-1.7.11	2012-08-24 12:05:30 -07:00
git-gc.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-get-tar-commit-id.txt
git-grep.txt	grep: add a grep.patternType configuration setting	2012-08-03 09:58:02 -07:00
git-gui.txt
git-hash-object.txt
git-help.txt
git-http-backend.txt
git-http-fetch.txt
git-http-push.txt
git-imap-send.txt
git-index-pack.txt	index-pack: support multithreaded delta resolving	2012-05-07 15:48:15 -07:00
git-init-db.txt
git-init.txt
git-instaweb.txt
git-log.txt	doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt	2012-09-06 13:26:50 -07:00
git-lost-found.txt	Documentation: do not mention .git/refs/* directories	2012-08-06 14:04:16 -07:00
git-ls-files.txt
git-ls-remote.txt	ls-remote: document the '--get-url' option	2012-09-07 10:58:35 -07:00
git-ls-tree.txt
git-mailinfo.txt
git-mailsplit.txt
git-merge-base.txt	merge-base: "--is-ancestor A B"	2012-08-31 11:45:33 -07:00
git-merge-file.txt
git-merge-index.txt
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	doc: A few minor copy edits.	2012-08-06 15:34:20 -07:00
git-mergetool--lib.txt
git-mergetool.txt	Merge branch 'da/difftool-updates'	2012-08-27 11:55:17 -07:00
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt
git-notes.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-p4.txt	git-p4: add submit --conflict option and config varaiable	2012-09-16 21:52:53 -07:00
git-pack-objects.txt
git-pack-redundant.txt
git-pack-refs.txt	Merge branch 'jc/tag-doc' into maint-1.7.11	2012-08-24 12:05:30 -07:00
git-parse-remote.txt
git-patch-id.txt
git-peek-remote.txt
git-prune-packed.txt
git-prune.txt
git-pull.txt	man: git pull -r is a short for --rebase	2012-08-17 00:26:52 -07:00
git-push.txt	Merge branch 'jk/doc-asciidoc-inline-literal'	2012-05-02 13:51:45 -07:00
git-quiltimport.txt
git-read-tree.txt
git-rebase.txt	doc: A few minor copy edits.	2012-08-06 15:34:20 -07:00
git-receive-pack.txt
git-reflog.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-relink.txt
git-remote-ext.txt
git-remote-fd.txt
git-remote-helpers.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-remote-testgit.txt
git-remote.txt	remote: prefer subcommand name 'remove' to 'rm'	2012-09-06 13:23:22 -07:00
git-repack.txt	fsck: --no-dangling omits "dangling object" information	2012-02-28 14:55:39 -08:00
git-replace.txt	Documentation: do not mention .git/refs/* directories	2012-08-06 14:04:16 -07:00
git-repo-config.txt
git-request-pull.txt
git-rerere.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-reset.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-rev-list.txt
git-rev-parse.txt	Merge branch 'jc/sha1-name-more'	2012-07-22 12:55:07 -07:00
git-revert.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-rm.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-send-email.txt
git-send-pack.txt
git-sh-i18n--envsubst.txt	correct a few doubled-word nits in comments and documentation	2012-03-28 11:18:35 -07:00
git-sh-i18n.txt
git-sh-setup.txt
git-shell.txt
git-shortlog.txt	Documentation: describe subject more precisely	2012-09-13 21:30:21 -07:00
git-show-branch.txt
git-show-index.txt
git-show-ref.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-show.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-stage.txt
git-stash.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-status.txt	Merge branch 'jk/maint-status-porcelain-z-b' into maint	2012-05-24 17:32:30 -07:00
git-stripspace.txt
git-submodule.txt	Teach "git submodule add" the --name option	2012-09-29 21:49:11 -07:00
git-svn.txt	git-svn: clarify the referent of dcommit's optional argument	2012-05-17 09:35:18 +00:00
git-symbolic-ref.txt	symbolic-ref --short: abbreviate the output unambiguously	2012-02-27 15:58:36 -08:00
git-tag.txt	Merge branch 'jc/tag-doc' into maint-1.7.11	2012-08-24 12:05:30 -07:00
git-tar-tree.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-tools.txt
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt	update-index: upgrade/downgrade on-disk index version	2012-04-04 09:57:50 -07:00
git-update-ref.txt
git-update-server-info.txt
git-upload-archive.txt
git-upload-pack.txt
git-var.txt	ident: report passwd errors with a more friendly message	2012-05-22 09:08:20 -07:00
git-verify-pack.txt
git-verify-tag.txt
git-web--browse.txt
git-whatchanged.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
git-write-tree.txt
git.txt	Git 1.7.12.1	2012-09-18 14:34:31 -07:00
gitattributes.txt	Merge branch 'aj/xfuncname-ada'	2012-09-25 10:40:11 -07:00
gitcli.txt	Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11	2012-09-14 20:45:03 -07:00
gitcore-tutorial.txt	Documentation: describe subject more precisely	2012-09-13 21:30:21 -07:00
gitcredentials.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
gitcvs-migration.txt
gitdiffcore.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
gitglossary.txt
githooks.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
gitignore.txt	Doc: separate gitignore pattern sources	2012-09-18 21:47:45 -07:00
gitk.txt
gitmodules.txt	Teach "git submodule add" the --name option	2012-09-29 21:49:11 -07:00
gitnamespaces.txt
gitrepository-layout.txt
gitrevisions.txt
gittutorial-2.txt
gittutorial.txt	Documentation: describe subject more precisely	2012-09-13 21:30:21 -07:00
gitweb.conf.txt	Documentation: spelling fixes	2012-06-19 11:35:19 -07:00
gitweb.txt	Documentation/gitweb: trivial English fixes	2012-03-23 11:22:04 -07:00
gitworkflows.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
glossary-content.txt	doc: A few minor copy edits.	2012-08-06 15:34:20 -07:00
howto-index.sh
i18n.txt
install-doc-quick.sh
install-webdoc.sh
mailmap.txt
Makefile	Documentation/Makefile: Allow custom XMLTO binary	2012-09-19 16:35:10 -07:00
manpage-1.72.xsl
manpage-base-url.xsl.in
manpage-base.xsl
manpage-bold-literal.xsl
manpage-normal.xsl
manpage-quote-apos.xsl
manpage-suppress-sp.xsl
merge-config.txt
merge-options.txt	merge: backport GIT_MERGE_AUTOEDIT support	2012-03-20 15:39:10 -07:00
merge-strategies.txt	merge: teach -Xours/-Xtheirs to binary ll-merge driver	2012-09-08 21:27:19 -07:00
pretty-formats.txt	Documentation: Document signature showing options	2012-09-20 10:28:51 -07:00
pretty-options.txt	Documentation: Document signature showing options	2012-09-20 10:28:51 -07:00
pull-fetch-param.txt	docs: stop using asciidoc no-inline-literal	2012-04-26 13:19:06 -07:00
rev-list-options.txt	Merge branch 'nd/log-n-doc' into maint	2012-09-20 15:54:43 -07:00
revisions.txt	Merge branch 'nd/branch-v-alignment'	2012-09-07 11:10:02 -07:00
sequencer.txt
SubmittingPatches
urls-remotes.txt
urls.txt
user-manual.conf	docs: monospace listings in docbook output	2012-08-07 14:30:52 -07:00
user-manual.txt	Documentation: describe subject more precisely	2012-09-13 21:30:21 -07:00