Re: rebasing a merge
- From
Peter Krefting <peter@softwolves.pp.se>
- Date
- Jun 24, 2010, 09:16 UTC
- Message-ID
- <alpine.DEB.2.00.1006241012400.28950@ds9.cixit.se>
- In-Reply-To
- <AANLkTikH9S1GCOwJfmKvO4fTvG46libJtrdMNQeiBm1_@mail.gmail.com>
Jay Soffian:
> I'm familiar with rerere.
Yes, of course, sorry for not recognizing your name :-)
> Which is what I was doing. But it occurred to me that the final tree > that I want is the same as if I just do a second merge,
So, you want to just discard the change in the new commit on the branch you merged?
You could probably get off by "git cat-file" the commit object, changing the parent reference to point to the newly introduced commit while leaving the rest intact, and then "git hash-object" the new commit object, and then forward the branch head to that one.
-- \\// Peter - http://www.softwolves.pp.se/