Re: Switching heads and head vs branch after CVS import
On Mon, Aug 15, 2005 at 12:38:53PM +0200, Matthias Urlichs wrote:
Show 10 quoted lines
> Hi, Wolfgang Denk wrote:
>
> > Assume I know exactly where the merge back happenend - is there any
> > way to tell git about it, so I don't see all these dangling heads any
> > more?
>
> Two ways:
> - you can enhance cvs2git to do it at the appropriate time. Good luck.
> - after the fact, and after finding the relevant heads manually, you can
> use .git/info/grafts to fake it.
- Create the merge commit manually and then rebase the rest of the branch
on top of that commit.
Maybe you could enhance git-rebase to rebase on top of more than
one head, performing the merge for you.
skimo