Don't forget git-imerge

[ramcdona]

git-imerge is like power steering for Git. Greatest thing ever.

[ccoVeille]

This one https://github.com/mhagger/git-imerge ?

[ramcdona]

Yes, thats the one. Sorry for not including a link.