That would be... git. It's specifically designed to be used in the distributed manner that you describe.