On Jan 3, 2008 12:40 AM, Charles Bailey [off-list ref] wrote:
You could then do this with a 'git filter-branch --parent-filter' to
rewrite the parents of the merge commits. As far as I can see, you
would need to call filter-branch once per merge to rewrite everything
from the merge commit forwards.
I believe there is a much easier way to do that using .git/info/grafts
The first step is to create .git/info/grafts, which specifies commit-id
and its parents for each commit that you want to change. Then you
can check the result using gitk, and if you are satisfied with what
you see then you run git filter-branch on it to convert 'fake' parents
into real ones.
Dmitry