On Fri, 2011-09-02 at 11:01 +0100, Nicholas Clark wrote:
> He doesn't have the graft that removes the mistaken merge?
>
> [I can't remember the details, I suspect you can.]
The graft that I'm familiar with is:
umgah ~/prog/perl/git (blead) $ cat .git/info/grafts
296f12bbbbaa06de9be9d09d3dcf8f4528898a49 434946e0cb7a32589ed92d18008aaa1d88515930
This modifies the parents of 296f12b, which is a commit on maint-5.10,
to remove its second parent, which mistakenly points into blead. I
believe it's possible to do the equivalent of distributing graft files
using "replace" refs, but I'm not familiar enough with them to suggest
how.
- Alex
Thread Previous
|
Thread Next