modify magit setting
Merge branch modify-magit-setting