user/sven/git.git/Documentation/git-pull.txt, branch v1.4.3.5

Remove trailing dot after short description

2006-03-09T19:44:11Z

Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

Docs: move git url and remotes text to separate sections

2006-02-07T05:14:56Z

The sections on git urls and remotes files in the git-fetch, git-pull, and git-push manpages seem long enough to be worth a manpage section of their own. Signed-off-by: J. Bruce Fields Signed-off-by: Junio C Hamano

Examples of resetting.

2005-12-17T02:23:33Z

Morten Welinder says examples of resetting is really about recovering from botched commit/pulls. I agree that pointers from commands that cause a reset to be needed in the first place would be very helpful. Also reset examples did not mention "pull/merge" cases. Signed-off-by: Junio C Hamano

Refactored merge options into separate merge-options.txt.

2005-11-07T07:32:04Z

Refactored fetch options into separate fetch-options.txt. Made git-merge use merge-options. Made git-fetch use fetch-options. Made git-pull use merge-options and fetch-options. Added --help option to git-pull and git-format-patch scripts. Rewrote Documentation/Makefile to dynamically determine include dependencies. Signed-off-by: Jon Loeliger Signed-off-by: Junio C Hamano

Refactor merge strategies into separate includable file.

2005-11-06T18:31:48Z

Signed-off-by: Jon Loeliger Signed-off-by: Junio C Hamano

Documentation: git-fetch/pull updates.

2005-11-05T09:39:18Z

We do not accept multiple on one Pull:/Push: line right now (we could lift this tentative workaround for the broken refnames), but we have always accepted multiple such lines, so use that form in the examples and discussion. Also explicitly mention that Octopus is made only with an explicit command line request and never from Pull: lines. Add a couple of cross references. Signed-off-by: Junio C Hamano

Added a few examples to git-pull man page.

2005-11-05T03:28:39Z

Clarified and added notes for pull/push refspecs. Converted to back-ticks for literal text examples. [jc: Also fixed git-pull description that still talked about its calling git-resolve or git-octopus (we do not anymore; instead we just call git-merge). BTW, I am reasonably impressed by how well "git-am -3" applied this patch, which had some conflicts because I've updated the documentation somewhat.] Signed-off-by: Jon Loeliger Signed-off-by: Junio C Hamano

Documentation: -merge and -pull: describe merge strategies.

2005-11-04T08:18:29Z

... and give a couple of examples of running 'git pull' against local repository. Signed-off-by: Junio C Hamano

Document the use of "current directory" as pull source.

2005-11-01T22:03:13Z

The repository to pull from can be a local repository, and as a special case the current directory can be specified to perform merges across local branches. Signed-off-by: Junio C Hamano

git-fetch/push/pull: documentation.

2005-10-20T04:25:39Z

The documentation was lazily sharing the argument description across these commands. Lazy may be a way of life, but that does not justify confusing others ;-). Signed-off-by: Junio C Hamano