Re: Problem upgrading to 1.4.0

["Geoff Russell" <geoffrey.russell@gmail.com>]

On 6/13/06, Pavel Roskin <proski@gnu.org> wrote:
> On Mon, 2006-06-12 at 20:28 -0700, Linus Torvalds wrote:
> >
> > On Mon, 12 Jun 2006, Pavel Roskin wrote:
> > >
> > > > You can get a list of the remote branches whenever you want:
> > > >
> > > > $ git ls-remote -h <remote>
> > >
> > > I heard of that command.  But git-clone only uses it for local and rsync
> > > protocols.
> >
> > The native format doesn't _need_ to use "git ls-remote", because the
> > native format does it on its own.
>
> OK.  I actually suspected that git-ls-remote was limited to some
> protocols.  I'm glad to be wrong about it.

Just so we don't lose sight of the forest for the trees, the most
common thing I want to do is:  "get me up-to-date-with-origin,
don't overwrite any branches of mine, but get me anything on the
origin which I don't have".  Hence I think this should be one fairly
simple command -- git pull origin.

The first time I had this problem, I gave up trying to fix it and just
rm'd my git
repository and re'cloned it. The second time it happened, I knew a
little bit more and worked out how to fix it.

Cheers,
Geoff Russell



>
> --
> Regards,
> Pavel Roskin
>
>