git rebase

1.git config pull.rebase false

post-thumbnail

2.git config pull.rebase true

post-thumbnail