Tracking of subdirectories from other branches: a subtree-like merge strategy and a custom subproject git command.