2016-04-14 53 views
0

我在我的電腦,當我運行:我怎麼能看到git的文件的更改拉

$ 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的查看那些已更改的文件?

+0

看來你的PC配置做'混帳拉--rebase',而服務器做一個普通的'拉'代替。 – choroba

回答

0

您可以通過運行pull -v打開詳細模式,而且還似乎你有pull.rebase == true在你的混帳配置

相關問題