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

On Thu Dec 21 2006, Matthew Wilcox wrote:
> 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.  

Umm...

> He committed a merge of the 
> 'master' branch to the 'linus' branch, which I had to revert.  

I was not aware that I did it (or even how I did it if I did it :-))
At least it was not intentional and sorry if I created some uncessary work for others here.
It's really complicated.... 

> 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).

git-log in my linus tree shows:

commit 6e6ed6529f7459862a98447d7abc5a75a6726ea6
Merge: f238085... aea7a1a...
Author: Helge Deller <[email protected]>
Date:   Thu Dec 21 15:36:03 2006 +0100

    Merge branch 'master' of ssh://git.parisc-linux.org/var/git/linux-2.6

commit aea7a1af76d8d7634eb2001eb6efcd92fba6e3c5
Author: Helge Deller <[email protected]>
Date:   Wed Dec 20 00:35:57 2006 +0100

    fix fixup declarations for 32bit and use CONFIG_64BIT

    Signed-off-by: Helge Deller <[email protected]>
.....

Can you give me a hint how I can get rid of the "merge branch" commit myself ?
I tried various combinations of "git-reset --hard HEAD^x" and git-pull, but now I'm stuck...

Helge