Jens Lehmann bbad9f9314 rm: better document side effects when removing a submodule ... The "Submodules" section of the "git rm" documentation mentions what will happen when a submodule with a gitfile gets removed with newer git. But it doesn't talk about what happens when the user changes between commits before and after the removal, which does not remove the submodule from the work tree like using the rm command did the first time. Explain what happens and what the user has to do manually to fix that in the new BUGS section. Also document this behavior in a new test. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2014-01-07 14:34:06 -08:00
..
howto	Merge branch 'sc/doc-howto-dumb-http'	2013-11-04 14:57:57 -08:00
RelNotes	Sync with 1.8.5.2	2013-12-17 14:12:17 -08:00
technical	Merge branch 'mi/typofixes' into maint	2013-12-17 11:34:01 -08:00
.gitattributes
.gitignore
asciidoc.conf
blame-options.txt	blame: document multiple -L support	2013-08-06 14:34:43 -07:00
build-docdep.perl
cat-texi.perl
cmd-list.perl
CodingGuidelines	Merge branch 'jj/doc-markup-hints-in-coding-guidelines' into maint	2013-12-17 11:36:10 -08:00
config.txt	fetch --prune: prune only based on explicit refspecs	2013-10-30 14:16:37 -07:00
date-formats.txt	Correct word usage of "timezone" in "Documentation" directory	2013-11-12 10:47:17 -08:00
diff-config.txt	Improve documentation concerning the status.submodulesummary setting	2013-09-11 12:20:41 -07:00
diff-format.txt
diff-generate-patch.txt
diff-options.txt	Merge branch 'mm/diff-no-patch-synonym-to-s'	2013-07-22 11:23:27 -07:00
docbook-xsl.css
docbook.xsl
everyday.txt	Documentation: make AsciiDoc links always point to HTML files	2013-09-06 14:49:06 -07:00
fetch-options.txt	fetch-options.txt: simplify ifdef/ifndef/endif usage	2013-10-30 14:16:41 -07:00
fix-texi.perl
git-add.txt	git add: --ignore-removal is a better named --no-all	2013-04-22 13:34:31 -07:00
git-am.txt	am: replace uses of --resolved with --continue	2013-06-27 09:37:12 -07:00
git-annotate.txt
git-apply.txt
git-archimport.txt
git-archive.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-bisect-lk2009.txt	typofix: documentation	2013-07-22 16:06:48 -07:00
git-bisect.txt
git-blame.txt	Correct word usage of "timezone" in "Documentation" directory	2013-11-12 10:47:17 -08:00
git-branch.txt	Refer to branch.<name>.remote/merge when documenting --track	2013-09-09 11:03:01 -07:00
git-bundle.txt
git-cat-file.txt	Merge branch 'rh/ishes-doc'	2013-09-17 11:42:51 -07:00
git-check-attr.txt	Merge branch 'jc/check-x-z'	2013-09-04 12:23:25 -07:00
git-check-ignore.txt	check-ignore: Add option to ignore index contents	2013-09-12 15:40:29 -07:00
git-check-mailmap.txt	builtin: add git-check-mailmap command	2013-07-13 10:19:37 -07:00
git-check-ref-format.txt	Add new @ shortcut for HEAD	2013-09-12 14:39:34 -07:00
git-checkout-index.txt
git-checkout.txt	checkout: update synopsys and documentation on detaching HEAD	2013-09-11 12:32:01 -07:00
git-cherry-pick.txt
git-cherry.txt	Documentation: revamp git-cherry(1)	2013-11-27 12:16:49 -08:00
git-citool.txt
git-clean.txt	Documentation/git-clean: fix description for range	2013-07-24 19:16:13 -07:00
git-clone.txt	Revert "git-clone.txt: remove the restriction on pushing from a shallow clone"	2013-07-15 08:35:32 -07:00
git-column.txt
git-commit-tree.txt
git-commit.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-config.txt	Merge branch 'jc/url-match'	2013-09-09 14:50:36 -07:00
git-count-objects.txt
git-credential-cache--daemon.txt
git-credential-cache.txt
git-credential-store.txt
git-credential.txt	Documentation: make AsciiDoc links always point to HTML files	2013-09-06 14:49:06 -07:00
git-cvsexportcommit.txt
git-cvsimport.txt	Correct word usage of "timezone" in "Documentation" directory	2013-11-12 10:47:17 -08:00
git-cvsserver.txt
git-daemon.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-describe.txt	use 'commit-ish' instead of 'committish'	2013-09-04 15:03:03 -07:00
git-diff-files.txt
git-diff-index.txt	Documentation/diff-index: mention two modes of operation	2013-05-20 15:50:44 -07:00
git-diff-tree.txt
git-diff.txt	diff --no-index: describe in a separate paragraph	2013-08-28 15:17:18 -07:00
git-difftool.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-fast-export.txt	Documentation: Update 'linux-2.6.git' -> 'linux.git'	2013-06-22 23:36:48 -07:00
git-fast-import.txt	Correct word usage of "timezone" in "Documentation" directory	2013-11-12 10:47:17 -08:00
git-fetch-pack.txt	Merge branch 'tb/doc-fetch-pack-url' into maint	2013-12-17 11:34:24 -08:00
git-fetch.txt	Merge branch 'fc/trivial'	2013-12-17 11:46:32 -08:00
git-filter-branch.txt
git-fmt-merge-msg.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-for-each-ref.txt	for-each-ref: introduce %(color:...) for color	2013-11-19 10:14:15 -08:00
git-format-patch.txt	format-patch doc: Thunderbird wraps lines unless mailnews.wraplength=0	2013-10-14 16:20:01 -07:00
git-fsck-objects.txt
git-fsck.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-gc.txt	Merge branch 'nd/gc-lock-against-each-other'	2013-09-04 12:35:34 -07:00
git-get-tar-commit-id.txt
git-grep.txt	Merge branch 'mg/more-textconv'	2013-10-23 13:21:31 -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	clone: open a shortcut for connectivity check	2013-05-28 08:07:20 -07:00
git-init-db.txt
git-init.txt
git-instaweb.txt
git-log.txt	Merge branch 'jj/log-doc' into maint	2013-12-17 11:35:41 -08:00
git-ls-files.txt
git-ls-remote.txt	ls-remote doc: don't encourage use of branches-file	2013-06-23 00:33:58 -07:00
git-ls-tree.txt
git-mailinfo.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-mailsplit.txt
git-merge-base.txt	merge-base: teach "--fork-point" mode	2013-10-29 13:06:08 -07:00
git-merge-file.txt	Documentation/git-merge-file: document option "--diff3"	2013-08-09 14:19:59 -07:00
git-merge-index.txt
git-merge-one-file.txt
git-merge-tree.txt	use 'tree-ish' instead of 'treeish'	2013-09-04 15:02:56 -07:00
git-merge.txt	git-merge: document the -S option	2013-10-18 12:47:33 -07:00
git-mergetool--lib.txt
git-mergetool.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-mktag.txt
git-mktree.txt
git-mv.txt	mv: better document side effects when moving a submodule	2014-01-07 14:33:04 -08:00
git-name-rev.txt	use 'commit-ish' instead of 'committish'	2013-09-04 15:03:03 -07:00
git-notes.txt
git-p4.txt	Change "remote tracking" to "remote-tracking"	2013-07-03 13:27:15 -07:00
git-pack-objects.txt	pack-objects doc: treat output filename as opaque	2013-12-16 11:36:09 -08:00
git-pack-redundant.txt
git-pack-refs.txt	Documentation: remove --prune from pack-refs examples	2013-07-18 16:23:46 -07:00
git-parse-remote.txt
git-patch-id.txt
git-prune-packed.txt	git-prune-packed.txt: fix reference to GIT_OBJECT_DIRECTORY	2013-10-15 16:01:22 -07:00
git-prune.txt	Documentation: fix git-prune example usage	2013-07-18 16:23:51 -07:00
git-pull.txt	doc/pull: clarify the illustrations	2013-10-31 13:45:29 -07:00
git-push.txt	push: use remote.$name.push as a refmap	2013-12-04 15:11:08 -08:00
git-quiltimport.txt
git-read-tree.txt
git-rebase.txt	rebase: use reflog to find common base with upstream	2013-12-10 10:56:30 -08:00
git-receive-pack.txt
git-reflog.txt	Merge branch 'jc/prune-all'	2013-05-29 14:23:04 -07:00
git-relink.txt
git-remote-ext.txt
git-remote-fd.txt
git-remote-helpers.txto
git-remote-testgit.txt
git-remote.txt	remote doc: document long forms of set-head options	2013-09-27 16:49:18 -07:00
git-repack.txt	Reword repack documentation to no longer state it's a script	2013-10-22 11:17:15 -07:00
git-replace.txt	Doc: 'replace' merge and non-merge commits	2013-09-09 08:16:30 -07:00
git-request-pull.txt
git-rerere.txt
git-reset.txt	Documentation: "git reset <tree-ish> <pathspec>" takes a tree-ish, not tree-sh	2013-07-19 10:15:09 -07:00
git-rev-list.txt	log doc: the argument to --encoding is not optional	2013-08-05 08:19:47 -07:00
git-rev-parse.txt	Merge branch 'jc/ref-excludes'	2013-12-05 12:59:09 -08:00
git-revert.txt	Documentation: make AsciiDoc links always point to HTML files	2013-09-06 14:49:06 -07:00
git-rm.txt	rm: better document side effects when removing a submodule	2014-01-07 14:34:06 -08:00
git-send-email.txt	send-email: be explicit with SSL certificate verification	2013-07-18 16:01:30 -07:00
git-send-pack.txt
git-sh-i18n--envsubst.txt
git-sh-i18n.txt
git-sh-setup.txt	Merge branch 'jc/reflog-doc'	2013-10-18 13:50:12 -07:00
git-shell.txt
git-shortlog.txt	git-shortlog.txt: make SYNOPSIS match log, update OPTIONS	2013-04-21 23:11:02 -07:00
git-show-branch.txt
git-show-index.txt
git-show-ref.txt	Merge branch 'db/show-ref-head'	2013-07-22 11:23:56 -07:00
git-show.txt	Documentation/git-show.txt: include common diff options, like git-log.txt	2013-07-17 17:50:56 -07:00
git-stage.txt
git-stash.txt	Revert "git stash: avoid data loss when "git stash save" kills a directory"	2013-08-14 09:53:43 -07:00
git-status.txt	Improve documentation concerning the status.submodulesummary setting	2013-09-11 12:20:41 -07:00
git-stripspace.txt
git-submodule.txt	Merge branch 'fg/submodule-clone-depth'	2013-07-15 10:28:48 -07:00
git-svn.txt	Correct word usage of "timezone" in "Documentation" directory	2013-11-12 10:47:17 -08:00
git-symbolic-ref.txt
git-tag.txt	Merge branch 'ds/doc-two-kinds-of-tags'	2013-07-31 12:38:21 -07:00
git-tools.txt
git-unpack-file.txt
git-unpack-objects.txt	Merge branch 'vd/doc-unpack-objects' into maint	2013-11-07 14:37:36 -08:00
git-update-index.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-update-ref.txt	update-ref: support multiple simultaneous updates	2013-09-09 09:54:37 -07:00
git-update-server-info.txt
git-upload-archive.txt
git-upload-pack.txt
git-var.txt
git-verify-pack.txt
git-verify-tag.txt
git-web--browse.txt	web--browse: Add support for xdg-open	2013-10-30 13:54:15 -07:00
git-whatchanged.txt	whatchanged: document its historical nature	2013-08-13 09:01:54 -07:00
git-write-tree.txt
git.txt	Merge branch 'zk/difftool-counts'	2013-12-27 14:58:13 -08:00
gitattributes.txt
gitcli.txt	Merge branch 'jj/doc-markup-gitcli' into maint	2013-12-17 11:36:38 -08:00
gitcore-tutorial.txt	core-tutorial: trim the section on Inspecting Changes	2013-08-13 09:01:52 -07:00
gitcredentials.txt
gitcvs-migration.txt	Documentation: make AsciiDoc links always point to HTML files	2013-09-06 14:49:06 -07:00
gitdiffcore.txt	diffcore-pickaxe doc: document -S and -G properly	2013-06-03 10:53:11 -07:00
gitglossary.txt
githooks.txt
gitignore.txt	gitignore.txt: clarify recursive nature of excluded directories	2013-12-09 10:55:48 -08:00
gitk.txt	Documentation: revamp gitk(1)	2013-10-22 11:23:31 -07:00
gitmodules.txt	Documentation/gitmodules: Only 'update' and 'url' are required	2014-01-06 09:08:18 -08:00
gitnamespaces.txt
gitremote-helpers.txt	Merge branch 'mm/remote-helpers-doc'	2013-09-12 14:41:50 -07:00
gitrepository-layout.txt	Document .git/modules	2013-06-09 13:45:32 -07:00
gitrevisions.txt
gittutorial-2.txt
gittutorial.txt
gitweb.conf.txt	gitweb: Add a feature for adding more branch refs	2013-12-12 12:37:37 -08:00
gitweb.txt	typofix: documentation	2013-07-22 16:06:48 -07:00
gitworkflows.txt
glossary-content.txt	glossary-content.txt: fix documentation of "**" patterns	2013-11-21 10:33:40 -08:00
howto-index.sh
i18n.txt
install-doc-quick.sh
install-webdoc.sh
line-range-format.txt	line-range: teach -L^:RE to search from start of file	2013-08-06 14:48:02 -07:00
mailmap.txt
Makefile	howto: add article on recovering a corrupted object	2013-10-25 14:55:30 -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 branch 'rh/merge-options-doc-fix' into maint	2013-07-03 15:36:30 -07:00
merge-strategies.txt	Documentation: document pitfalls with 3-way merge	2013-12-09 13:42:40 -08:00
pretty-formats.txt	Merge branch 'nd/pretty-formats'	2013-04-23 11:22:48 -07:00
pretty-options.txt	log doc: the argument to --encoding is not optional	2013-08-05 08:19:47 -07:00
pull-fetch-param.txt	fetch: opportunistically update tracking refs	2013-05-12 15:23:48 -07:00
rev-list-options.txt	Merge branch 'jj/rev-list-options-doc' into maint	2013-12-17 11:34:41 -08:00
revisions.txt	Merge branch 'fc/at-head'	2013-09-20 12:38:10 -07:00
sequencer.txt
SubmittingPatches	Merge branch 'rs/doc-submitting-patches' into maint	2013-12-17 11:38:23 -08:00
urls-remotes.txt
urls.txt	Merge branch 'ft/doc-git-transport' into maint	2013-07-21 22:51:24 -07:00
user-manual.conf
user-manual.txt	Merge branch 'ss/doclinks'	2013-09-17 11:42:54 -07:00