add cherry-pick cp
try to get git completion to work (again)