Comment by adamnemecek

I'm surprised Github et al. haven't tried to contribute some functionality for doing this to git. The thing described in the article is extremely common.