[gitconfig] merge use no-ff as default
[gitconfig] set default editor.