added diff tool in config file
simplify git color setting
added editor setting