Jonathan Nieder 3f8fc184c0 Documentation: flesh out “git pull” description ... The current description in the pull man page does not say much more than that “git pull” is fetch + merge. Though that is all a person needs to know in the end, it would be useful to summarize a bit about what those commands do for new readers. Most of this description is taken from the “git merge” docs. Now that we explain how to back out of a failed merge (reset --merge), we can tone down the warning against that a bit. Except, as Thomas noticed, there’s a risk with that because people might read this version of the manpage online and then conclude that it is safe to try a merge with uncommitted changes, only to find that their “git reset” doesn't support --merge yet. Or worse, verify that their git-reset has --merge by a quick test (1b5b465 is in 1.6.2) but then find that it does not help with backing out of a merge (e11d7b5 is only in 1.7.0!). So keep the warning. With clarifications from Ævar, Thomas, and Junio. Noticed-by: Geoff Russell <geoffrey.russell@gmail.com> Cc: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Cc: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-08-02 15:48:18 -07:00
..
howto
pt_BR
technical	Merge branch 'maint'	2010-07-11 23:47:29 -07:00
.gitattributes
.gitignore
asciidoc.conf
blame-options.txt
build-docdep.perl
cat-texi.perl
cmd-list.perl
CodingGuidelines
config.txt	Merge branch 'maint'	2010-07-15 12:04:32 -07:00
date-formats.txt
diff-format.txt
diff-generate-patch.txt
diff-options.txt	Merge branch 'jl/maint-diff-ignore-submodules'	2010-06-30 11:55:37 -07:00
docbook-xsl.css
docbook.xsl
everyday.txt
fetch-options.txt	git fetch documentation: describe short '-p' synonym to '--prune' option	2010-07-13 09:13:34 -07:00
fix-texi.perl
git-add.txt	git add: Add --ignore-missing to SYNOPSIS	2010-07-19 11:11:46 -07:00
git-am.txt
git-annotate.txt
git-apply.txt
git-archimport.txt
git-archive.txt
git-bisect-lk2009.txt
git-bisect.txt
git-blame.txt
git-branch.txt
git-bundle.txt
git-cat-file.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-check-attr.txt
git-check-ref-format.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-checkout-index.txt
git-checkout.txt	Merge branch 'maint'	2010-07-11 23:47:29 -07:00
git-cherry-pick.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt
git-commit-tree.txt
git-commit.txt	Merge branch 'maint'	2010-06-07 15:46:01 -07:00
git-config.txt
git-count-objects.txt
git-cvsexportcommit.txt
git-cvsimport.txt
git-cvsserver.txt	Merge branch 'eb/core-eol'	2010-06-21 06:02:49 -07:00
git-daemon.txt
git-describe.txt
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt
git-diff.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-difftool.txt
git-fast-export.txt
git-fast-import.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-fetch-pack.txt
git-fetch.txt
git-filter-branch.txt
git-fmt-merge-msg.txt
git-for-each-ref.txt
git-format-patch.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-fsck-objects.txt
git-fsck.txt
git-gc.txt	Merge branch 'maint'	2010-07-05 11:56:53 -07:00
git-get-tar-commit-id.txt
git-grep.txt	Merge branch 'jn/grep-open'	2010-06-30 11:55:38 -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
git-init-db.txt
git-init.txt
git-instaweb.txt
git-log.txt	Merge branch 'eb/doc-log-manpage'	2010-07-15 12:07:56 -07:00
git-lost-found.txt
git-ls-files.txt
git-ls-remote.txt
git-ls-tree.txt
git-mailinfo.txt	git-mailinfo documentation: clarify -u/--encoding	2010-06-13 20:18:23 -07:00
git-mailsplit.txt
git-merge-base.txt
git-merge-file.txt
git-merge-index.txt
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt
git-mergetool--lib.txt
git-mergetool.txt	Documentation: Explain git-mergetool's use of temporary files	2010-07-19 09:16:09 -07:00
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt
git-notes.txt	Merge branch 'mg/notes-dry-run'	2010-06-13 11:22:39 -07:00
git-pack-objects.txt
git-pack-redundant.txt
git-pack-refs.txt
git-parse-remote.txt
git-patch-id.txt
git-peek-remote.txt
git-prune-packed.txt
git-prune.txt
git-pull.txt	Documentation: flesh out “git pull” description	2010-08-02 15:48:18 -07:00
git-push.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-quiltimport.txt
git-read-tree.txt
git-rebase.txt	rebase -i -p: document shortcomings	2010-06-11 08:44:13 -07:00
git-receive-pack.txt
git-reflog.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-relink.txt
git-remote-helpers.txt
git-remote.txt	Merge branch 'jn/remote-set-branches'	2010-06-18 11:16:55 -07:00
git-repack.txt
git-replace.txt
git-repo-config.txt
git-request-pull.txt
git-rerere.txt	rerere.txt: Document forget subcommand	2010-07-05 11:51:20 -07:00
git-reset.txt
git-rev-list.txt
git-rev-parse.txt	Documentation: split off rev doc into include file	2010-07-05 13:38:10 -07:00
git-revert.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-rm.txt
git-send-email.txt	Merge branch 'tr/send-email-8bit' into maint	2010-06-28 16:19:03 -07:00
git-send-pack.txt
git-sh-setup.txt
git-shell.txt
git-shortlog.txt
git-show-branch.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-show-index.txt
git-show-ref.txt
git-show.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
git-stage.txt
git-stash.txt
git-status.txt	Merge branch 'jl/status-ignore-submodules'	2010-06-30 11:55:39 -07:00
git-stripspace.txt
git-submodule.txt	git submodule add: Remove old docs about implicit -f	2010-07-19 11:11:07 -07:00
git-svn.txt
git-symbolic-ref.txt
git-tag.txt
git-tar-tree.txt
git-tools.txt
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt
git-update-ref.txt
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
git-whatchanged.txt
git-write-tree.txt
git.txt	Git 1.7.2	2010-07-21 12:55:50 -07:00
gitattributes.txt	Merge branch 'eb/core-eol'	2010-06-21 06:02:49 -07:00
gitcli.txt
gitcore-tutorial.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
gitcvs-migration.txt
gitdiffcore.txt
gitglossary.txt
githooks.txt
gitignore.txt
gitk.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00
gitmodules.txt	gitmodules.5: url can be a relative path	2010-07-15 11:59:57 -07:00
gitrepository-layout.txt
gitrevisions.txt	Documentation: gitrevisions	2010-07-05 13:39:02 -07:00
gittutorial-2.txt
gittutorial.txt
gitworkflows.txt
glossary-content.txt
howto-index.sh
i18n.txt
install-doc-quick.sh
install-webdoc.sh
mailmap.txt
Makefile	Documentation: gitrevisions	2010-07-05 13:39:02 -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-strategies.txt
pretty-formats.txt	pretty: Introduce ' ' modifier to add space if non-empty	2010-06-16 14:45:09 -07:00
pretty-options.txt
pull-fetch-param.txt
RelNotes-1.5.0.1.txt
RelNotes-1.5.0.2.txt
RelNotes-1.5.0.3.txt
RelNotes-1.5.0.4.txt
RelNotes-1.5.0.5.txt
RelNotes-1.5.0.6.txt
RelNotes-1.5.0.7.txt
RelNotes-1.5.0.txt
RelNotes-1.5.1.1.txt
RelNotes-1.5.1.2.txt
RelNotes-1.5.1.3.txt
RelNotes-1.5.1.4.txt
RelNotes-1.5.1.5.txt
RelNotes-1.5.1.6.txt
RelNotes-1.5.1.txt
RelNotes-1.5.2.1.txt
RelNotes-1.5.2.2.txt
RelNotes-1.5.2.3.txt
RelNotes-1.5.2.4.txt
RelNotes-1.5.2.5.txt
RelNotes-1.5.2.txt
RelNotes-1.5.3.1.txt
RelNotes-1.5.3.2.txt
RelNotes-1.5.3.3.txt
RelNotes-1.5.3.4.txt
RelNotes-1.5.3.5.txt
RelNotes-1.5.3.6.txt
RelNotes-1.5.3.7.txt
RelNotes-1.5.3.8.txt
RelNotes-1.5.3.txt
RelNotes-1.5.4.1.txt
RelNotes-1.5.4.2.txt
RelNotes-1.5.4.3.txt
RelNotes-1.5.4.4.txt
RelNotes-1.5.4.5.txt
RelNotes-1.5.4.6.txt
RelNotes-1.5.4.7.txt
RelNotes-1.5.4.txt
RelNotes-1.5.5.1.txt
RelNotes-1.5.5.2.txt
RelNotes-1.5.5.3.txt
RelNotes-1.5.5.4.txt
RelNotes-1.5.5.5.txt
RelNotes-1.5.5.6.txt
RelNotes-1.5.5.txt
RelNotes-1.5.6.1.txt
RelNotes-1.5.6.2.txt
RelNotes-1.5.6.3.txt
RelNotes-1.5.6.4.txt
RelNotes-1.5.6.5.txt
RelNotes-1.5.6.6.txt
RelNotes-1.5.6.txt
RelNotes-1.6.0.1.txt
RelNotes-1.6.0.2.txt
RelNotes-1.6.0.3.txt
RelNotes-1.6.0.4.txt
RelNotes-1.6.0.5.txt
RelNotes-1.6.0.6.txt
RelNotes-1.6.0.txt
RelNotes-1.6.1.1.txt
RelNotes-1.6.1.2.txt
RelNotes-1.6.1.3.txt
RelNotes-1.6.1.4.txt
RelNotes-1.6.1.txt
RelNotes-1.6.2.1.txt
RelNotes-1.6.2.2.txt
RelNotes-1.6.2.3.txt
RelNotes-1.6.2.4.txt
RelNotes-1.6.2.5.txt
RelNotes-1.6.2.txt
RelNotes-1.6.3.1.txt
RelNotes-1.6.3.2.txt
RelNotes-1.6.3.3.txt
RelNotes-1.6.3.4.txt
RelNotes-1.6.3.txt
RelNotes-1.6.4.1.txt
RelNotes-1.6.4.2.txt
RelNotes-1.6.4.3.txt
RelNotes-1.6.4.4.txt
RelNotes-1.6.4.txt
RelNotes-1.6.5.1.txt
RelNotes-1.6.5.2.txt
RelNotes-1.6.5.3.txt
RelNotes-1.6.5.4.txt
RelNotes-1.6.5.5.txt
RelNotes-1.6.5.6.txt
RelNotes-1.6.5.7.txt
RelNotes-1.6.5.8.txt
RelNotes-1.6.5.txt
RelNotes-1.6.6.1.txt
RelNotes-1.6.6.2.txt
RelNotes-1.6.6.txt
RelNotes-1.7.0.1.txt
RelNotes-1.7.0.2.txt
RelNotes-1.7.0.3.txt
RelNotes-1.7.0.4.txt
RelNotes-1.7.0.5.txt
RelNotes-1.7.0.6.txt
RelNotes-1.7.0.txt
RelNotes-1.7.1.1.txt	Git 1.7.1.1	2010-06-29 09:59:56 -07:00
RelNotes-1.7.1.2.txt	backmerge a few more fixes to 1.7.1.X series	2010-07-07 11:16:32 -07:00
RelNotes-1.7.1.txt
RelNotes-1.7.2.txt	Git 1.7.2	2010-07-21 12:55:50 -07:00
rev-list-options.txt	Merge branch 'tr/rev-list-count'	2010-06-30 11:55:38 -07:00
revisions.txt	Documentation: split off rev doc into include file	2010-07-05 13:38:10 -07:00
SubmittingPatches	Merge branch 'rr/doc-submitting' into maint	2010-06-16 16:23:14 -07:00
urls-remotes.txt
urls.txt
user-manual.conf
user-manual.txt	Documentation: link to gitrevisions rather than git-rev-parse	2010-07-05 13:39:13 -07:00