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

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

Remove the version tags from the manpages

2005-10-10T21:49:52Z

Signed-off-by: Christian Meder Signed-off-by: Junio C Hamano

[PATCH] Documentation: Update all files to use the new gitlink: macro

2005-09-20T22:07:52Z

The replacement was performed automatically by these commands: perl -pi -e 's/link:(git.+)\.html\[\1\]/gitlink:$1\[1\]/g' \ README Documentation/*.txt perl -pi -e 's/link:git\.html\[git\]/gitlink:git\[7\]/g' \ README Documentation/*.txt Signed-off-by: Sergey Vlasov Signed-off-by: Junio C Hamano

Big tool rename.

2005-09-08T00:45:20Z

As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano