importing from git

Kevin Smith yarcs at qualitycode.com
Wed Jun 1 16:45:17 UTC 2005


Matt Mackall wrote:
> On Wed, Jun 01, 2005 at 07:33:16AM -0400, Chris Mason wrote:
> 
>>How do we deal with commits like this one:
>>
>>http://www.kernel.org/git/?p=git/git.git;a=commit;h=211232bae64bcc60bbf5d1b5e5b2344c22ed767e
>>
>>(it has 5 parents ;)
> 
> 
> Why the hell does git do that?

I don't know if it makes sense or not, but here's one opinion:
   http://marc.theaimsgroup.com/?l=git&m=111722553224992&w=2

Earlier, Linus explained the reasons against "octopus" merges:
   http://marc.theaimsgroup.com/?l=git&m=111722410323962&w=2

Kevin



More information about the Mercurial mailing list