[parisc-linux] Git tree rebased

[Matthew Wilcox]

On Wed, Nov 01, 2006 at 11:04:33AM +0000, Joel Soete wrote:
> * refs/heads/origin: does not fast forward to branch 'master' of 
> git://git.parisc-linux.org/git/linux-2.6;
>   not updating.
> 
> Any idea of what I missed?

It's THE BIT YOU JUST QUOTED!

> >If your remotes file currently has a line in it like:
> >
> >	Pull: refs/heads/master:refs/heads/origin
> >
> >then you'll want to add the '+' at the beginning:
> >
> >	Pull: +refs/heads/master:refs/heads/origin
> >
> >otherwise git will refuse to update.  With the +, it will complain, but
> >do it anyway.