threads / discuss / 25019

diff problem

Subject: diff problem

## tl;dr

3 messages between Sep 7, 2010 and Sep 7, 2010.

replies: 2people: 2as markdown or json

ZoltánFüzesi· Sep 7, 2010, 10:54 UTC · lore

Hi, git 1.7.3.rc0 (64 bit on Windows 7) diff shows no difference between my rebased topic branch and the its original state. Earlier it did.

Matthieu Moy· Sep 7, 2010, 11:06 UTC · re: ZoltánFüzesi · lore

Re: diff problem

ZoltánFüzesi <zfuzesi@eaglet.hu> writes:

> Hi, git 1.7.3.rc0 (64 bit on Windows 7) diff shows no difference between my 
> rebased topic branch and the its original state. Earlier it did.

Are you sure the rebase actually based your branch on a different commit? (i.e. does "git diff where-your-branch-used-to-start where-it-now-starts" show something?)

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

ZoltánFüzesi· Sep 7, 2010, 11:06 UTC · re: ZoltánFüzesi · lore

Re: diff problem

ZoltánFüzesi <zfuzesi <at> eaglet.hu> writes:

Show 5 quoted lines

> 
> Hi, git 1.7.3.rc0 (64 bit on Windows 7) diff shows no difference between my 
> rebased topic branch and the its original state. Earlier it did.
> 
>

sorry, i was stupid: during the rebase conflict resolution i removed the changes i expected to see... :/