git: Merge repositories and histories