added git cherry picking and mergetool, and some other changes