Add alias cp -> cherry-pick
Configure git difftool to use vimdiff