Add Git 'cpx' alias

- "cpx" alias does a "cherry-pick -x"
- Remove "-x" from "cp" alias