subtree
http://git-scm.com/book/en/Git-Tools-Subtree-Merging