[parisc-linux] Re:[parisc-linux-cvs] linux-2.6.git: Changes to 'master'

[Matthew Wilcox]

On Thu, Dec 21, 2006 at 10:55:31AM +0100, Joel Soete wrote:
> no error (???)
> [snip]
> * refs/heads/linus: not updating to non-fast forward branch 'linus' of
> http://www.parisc-linux.org/git/linux-2.6

That's the error.  It's Helge's fault.  He committed a merge of the
'master' branch to the 'linus' branch, which I had to revert.  So anyone
who pulled from the linus branch between Friday and Monday now doesn't
have a fast-forward.  You can do git-pull --force, or put the + in front
of the linus branch (the way you already have it for the master branch).