git fetch && git pull

git pull

拉取代码 并合并

git fetch

拉取代码 ，如果需要合并 需要执行git merge

git fetch 执行过程

git fetch origin develop:tmp  // 拉取远程develop分支，并放到本地tmp分支上
git diff tmp  //查看当前分支和tmp分支的区别
git merge tmp   // 把tmp分支合并到当前分支
git branch -d tmp   // 删除tmp分支

git featch 示例

D:\jd-pro\waf_pro\csa-log-flume>git fetch origin develop:tmp
remote: Counting objects: 21, done.
Unpacking objects: 100% (21/21), done.9)
remote: Compressing objects: 100% (19/19), done.
remote: Total 21 (delta 0), reused 2 (delta 0)
From git.jd.com:jcloud-sec/csa-log-flume
 * [new branch]      develop    -> tmp
 * [new tag]         v4.0       -> v4.0
   bc1a821..319396e  develop    -> origin/develop

D:\jd-pro\waf_pro\csa-log-flume>
D:\jd-pro\waf_pro\csa-log-flume>
D:\jd-pro\waf_pro\csa-log-flume>git fetch origin develop:tmp

D:\jd-pro\waf_pro\csa-log-flume>
D:\jd-pro\waf_pro\csa-log-flume>
D:\jd-pro\waf_pro\csa-log-flume>git branch
  develog-5.2
* develop
  develop-5.2
  master
  tmp

D:\jd-pro\waf_pro\csa-log-flume>git diff tmp
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index aa073c8..0000000
--- a/.gitattributes
+++ /dev/null

D:\jd-pro\waf_pro\csa-log-flume>git merge tmp
Updating bc1a821..319396e
Checking out files: 100% (321/321), done.

D:\jd-pro\waf_pro\csa-log-flume\src\main\java\com\jd\sa>git branch
  develog-5.2
* develop
  develop-5.2
  master
  tmp

D:\jd-pro\waf_pro\csa-log-flume\src\main\java\com\jd\sa>git branch -r tmp
fatal: -a and -r options to 'git branch' do not make sense with a branch name

D:\jd-pro\waf_pro\csa-log-flume\src\main\java\com\jd\sa>git branch -d tmp
Deleted branch tmp (was 319396e).

D:\jd-pro\waf_pro\csa-log-flume\src\main\java\com\jd\sa>git brach
git: 'brach' is not a git command. See 'git --help'.

The most similar command is
        branch

D:\jd-pro\waf_pro\csa-log-flume\src\main\java\com\jd\sa>git branch
  develog-5.2
* develop
  develop-5.2
  master