git/git-pull.sh, branch v0.99.8e

git-pull: do not barf on -a flag meant for git-fetch.

2005-10-03T22:45:44Z

Signed-off-by: Junio C Hamano

Use git-merge in git-pull (second try).

2005-09-29T07:24:41Z

This again makes git-pull to use git-merge, so that different merge strategy can be specified from the command line. Without explicit strategy parameter, it defaults to git-merge-resolve if only one remote is pulled, and git-merge-octopus otherwise, to keep the default behaviour of the command the same as the original. Also this brings another usability measure: -n flag from the command line, if given, is passed to git-merge to prevent it from running the diffstat at the end of the merge. Signed-off-by: Junio C Hamano

Use git-update-ref in scripts.

2005-09-28T23:42:44Z

This uses the git-update-ref command in scripts for safer updates. Also places where we used to read HEAD ref by using "cat" were fixed to use git-rev-parse. This will matter when we start using symbolic references. Signed-off-by: Junio C Hamano

Fix default pull not to do an unintended Octopus.

2005-09-28T23:22:00Z

The refspecs specified in the .git/remotes/ on the "Pull: " lines are for fetching multiple heads in one go, but most of the time making an Octopus out of them is not what is wanted. Make git-fetch leave the marker in .git/FETCH_HEAD file so that later stages can tell which heads are for merging and which are not. Tom Prince made me realize how stupid the original behaviour was. Signed-off-by: Junio C Hamano

Prettyprint octopus merge message.

2005-09-23T01:09:07Z

Including the current branch in the list of heads being merged was not a good idea, so drop it. And shorten the message by grouping branches and tags together to form a single line. Signed-off-by: Junio C Hamano

Revert "Use git-merge instead of git-resolve in git-pull."

2005-09-21T21:01:56Z

This reverts f887564ab72e107bcdee3ba83c91e2bb4ae13ca7 commit.

Revert "Make Octopus merge message a bit nicer."

2005-09-21T20:59:54Z

This reverts 63f1aa6c72c46928f1b6959437aed4becbc42ff3 commit.

Make Octopus merge message a bit nicer.

2005-09-21T01:16:27Z

Linus says that 'of .' to mean the commits came from the local repository was too confusing and ugly -- I tend to agree with him. Signed-off-by: Junio C Hamano

Use git-merge instead of git-resolve in git-pull.

2005-09-21T01:16:27Z

Signed-off-by: Junio C Hamano

Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.

2005-09-16T00:38:26Z

Signed-off-by: Junio C Hamano