Added new configs to git

rerere enabled true, editor e merge no-ff