Reorder color.diff config
Remove git br alias