git从远程库同步到本地仓库

远程仓库发生改变，本地仓库没有改变

  • 首先，查看远程仓库 git remote -v
$ git remote -v
origin  https://github.com/xiejianwei2016/xiejianwei2016.github.io.git (fetch)
origin  https://github.com/xiejianwei2016/xiejianwei2016.github.io.git (push)
  • 把远程库更新到本地 git fetch origin master
$ git fetch origin master
From https://github.com/xiejianwei2016/xiejianwei2016.github.io
 * branch            master     -> FETCH_HEAD
  • 比较远程更新和本地版本库的差异 git log master.. origin/master
$ git log master.. origin/master
  • 合并远程库 git merge origin/master

1.有差异

$ git merge origin/master
Updating 626e662..0c5d90f
Fast-forward
 _posts/2017-02-21-jdk-Object.md                | 77 +++++++++++++++++---------
 _posts/2017-05-28-java8-functionalInterface.md | 41 +++++++++++++-
 _posts/2017-05-28-java8-lambda.md              | 75 ++++++++++++++++++++++++-
 3 files changed, 163 insertions(+), 30 deletions(-)

2.无差异

$ git merge origin/master
Already up-to-date

远程仓库没有改变，本地仓库发生改变

远程仓库，本地仓库都发生改变

文章摘自：链接