set merge --no-ff as default
add git lgp alias
minor git config adjust