LinuxQuestions.org

LinuxQuestions.org (/questions/)
-   Linux - Kernel (https://www.linuxquestions.org/questions/linux-kernel-70/)
-   -   One question on git diff command (https://www.linuxquestions.org/questions/linux-kernel-70/one-question-on-git-diff-command-839678/)

Richard.Yang 10-21-2010 10:15 PM

One question on git diff command
 
I am a newbie of git, and I found the output is not my expected.

I have two branches , master and testing. In testing, I added one file such as file2.c.

Then I switch back to master branch, and try to merge this to master.
I can see this file2.c is in the master branch now. And git status shows, this file is ready to commit.

But when I use git diff, there shows no diff.

So how can I show this kind of diff?

Richard.Yang 10-21-2010 10:17 PM

BTW, how about to revert this merge, if I think this is not a good time to do this?


All times are GMT -5. The time now is 07:58 AM.