git diff 文件没有任何输出的解决方法

1. git status

有提示文件修改 例如:

[jason@vm-www1 d]$ git status
# On branch master
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: theme-images.php
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# ../../../nginx.conf
no changes added to commit (use "git add" and/or "git commit -a")

 

2. 使用git diff  theme-images.php

任何输出都没有

3. 解决方法:

---------------------- 未配置账号、邮箱 使用以下命令设置--------------------------------

git config --global user.name "jason"   #修改

git config --global user.email "json@fu101.com" #修改

-------------------------------------------------------------

git --no-pager diff  theme-images.php

有修改的日志

git config --global core.pager "more"

+++++++++++++++++++++++++++++++

[jason@vm-www1 d]$ git diff theme-images.php
diff --git a/wp-content/themes/d/theme-images.php b/wp-content/themes/d/theme-images.php
index 6f2023f..88e3118 100644
--- a/wp-content/themes/d/theme-images.php
+++ b/wp-content/themes/d/theme-images.php
@@ -1,4 +1,4 @@
- <?php
+<?php

/*-----------------------------------------------------------------------------------*/
// Add theme support for Featured Images/Post Thumnbnails
[jason@vm-www1 d]$

git config --global color.diff "auto"

posted @ 2014-07-09 18:40  编程狂热者  阅读(2991)  评论(0编辑  收藏  举报