`git pull` is not what's causing problems here. It's changing existing history that already exists across several repositories that's causing the problem.

The other points are merely the result of not really accepting the distributed nature of git. That distributed nature means that history is never going to be linear, and trying to force it is wasted effort.