Add merge tool, make git clone --recursice as default, and default git push to simple mode.