update gitconfig

merge no-ff, new branches auto rebase