prepare for git 2.0 syntax re: `add`
more parsing steps