[git] added cp alias for cherry-pick
[git] added mergetool option