What does git do right?

The important part of a merge is not how it handles conflicts (which need to be verified by a human anyway if they are at all interesting), but that it should meld the history together right so that you have a new solid base for future merges.

Git breaks the mould because it thinks about content, not files. It doesn’t track renames, it tracks content. And it does so at a whole-tree level. This is a radical departure from most version control systems. It doesn’t bother trying to store per-file histories; it instead stores the history at the tree level. When you perform a diff you are comparing two trees, not two files.

Time for me to take the plunge and give it a spin for my self. Darcs is also on my list to try, but I just need to see git in action first.

BTW Linus Torvalds knows your stupid and hates you.

Also see the video linked to in this post for more info on git

This entry was posted on Tuesday, July 17th, 2007 at 10:51 pm and is filed under Programming, Scott, Source Control Management. You can follow any responses to this entry through the RSS 2.0 feed. You can leave a response, or trackback from your own site.