混帐 pull -v : up to date but isn't

Question

我想知道我的分支是否与远程同步:

git pull -v
From ...
 = [up to date]      master     -> origin/master
 = [up to date]      release    -> origin/release

我读到上面的输出:好的，发布分支是最新的。

但是 git diff release origin/release 显示有差异

git pull -v 的输出是否正确？

Answer 1

git pull 做两件事:fetch 和 merge。

以上输出(“最新”)表示:fetch 是最新的。但注意: merge 还没有完成。

使用 git branch -av 你会得到更好的输出:

git branch -av
  release                4fa0a21 [behind 6] changed version from 2014.10 to 2014.11 in setup.py
  remotes/origin/release 4011230 changed version from 2014.12 to 2014.13 in setup.py