我如何查看git pull中的文件更改

Question

我在我的电脑上运行时：

$ git pull

我可以看到：

remote: Counting objects: 29, done.
remote: Compressing objects: 100% (23/23), done.
remote: Total 29 (delta 13), reused 0 (delta 0)
Unpacking objects: 100% (29/29), done.
From bitbucket.org:myorg/myrepository
   ddad276..505c341  dev        -> origin/dev
First, rewinding head to replay your work on top of it...
Applying: New section

但是在我的云服务器上，当我运行git pull时，我会看到一些不同的东西：

remote: Counting objects: 29, done.
remote: Compressing objects: 100% (23/23), done.
remote: Total 29 (delta 13), reused 0 (delta 0)
Unpacking objects: 100% (29/29), done.
From https://bitbucket.org/myorg/myrepository
   ddad276..505c341  dev        -> origin/dev
Updating ddad276..505c341
Fast-forward
 .../templates/myfile01.html.twig        |  8 ++++
 sites/css/custom.css  | 58 ++++++++++++++++++++-----
 .../sass/custom/_artifacts.scss  |  1 +
 .../sass/custom/_custom.scss     | 11 ++++-
.....................

然后，如何配置本地git以查看已更改的文件？

Answer 1

您可以通过运行pull -v打开详细模式，而且您的git config中似乎有pull.rebase == true 。