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

[Helge Deller]

On Thu Dec 21 2006, Matthew Wilcox wrote:
> On Thu, Dec 21, 2006 at 03:40:18PM +0100, Helge Deller wrote:
> > On Thu Dec 21 2006, Matthew Wilcox wrote:
> > > 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 :-))
> 
> I can't really tell you how you did it.  I do know that git won't merge
> on push, so you must have done something locally and then pushed it to
> the linus branch.  That could mean that you did something on your local
> 'linus' branch, and then pushed it.  Or it could mean that you did
> something on another branch and pushed it to our shared 'linus' branch.
> 
> > At least it was not intentional and sorry if I created some uncessary work for others here.
> > It's really complicated.... 
> 
> I think everyone here has made mistakes with git.  I certainly have.
> The good part about using git is that mistakes are generally undoable.
> Inconveniencing people is actually a feature -- it makes it hard for our
> repo to be corrupted maliciously or through a bug without anyone noticing.
> 
> > git-log in my linus tree shows:
> 
> Is that your linus *tree* or your linus *branch*?
> 
> In any case, you can get rid of this the same way I told Joel -- either
> git-fetch --force *or* put a + before the 'linus' branch in your
> .git/remotes/origin file.
> 
> > commit 6e6ed6529f7459862a98447d7abc5a75a6726ea6
> > Merge: f238085... aea7a1a...
> > Author: Helge Deller <deller at gmx.de>
> > 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 <deller at gmx.de>
> > Date:   Wed Dec 20 00:35:57 2006 +0100
> > 
> >     fix fixup declarations for 32bit and use CONFIG_64BIT
> > 
> >     Signed-off-by: Helge Deller <deller at gmx.de>
> > .....
> > 
> > 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...
> 
> git-reset is going to affect the branch you're currently on; not any
> other branch.  so if you did git-checkout linus; git-reset --hard HEAD^
> you should get the right answer.  But git-fetch --force should do the
> trick.

Thanks !
That did it.

Helge