Re: git: how to produce context diffs?

From: Sean <seanlkml@sympatico.ca>
Date: Nov 27, 2006, 17:06 UTC
Message-ID: <BAYC1-PASMTP11E0FF8B4ADAE232E667DDAEE60@CEZ.ICE>
In-Reply-To: <200611271705.36479.jnareb@gmail.com>

On Mon, 27 Nov 2006 17:05:35 +0100 Jakub Narebski <jnareb@gmail.com> wrote:

> > It appears the only valid options now are "-u XX" and "--unified=XX".
> 
> Which both mean the same.

Yes, I guess I should have said that. The point was really that you can't pass any-diff-option and expect it to work.

> Which, in convoluted way is said in documentation (the fact that
> GIT_DIFF_OPTS affect internal diff).

The idea is to make it less convoluted. It directly says that -c should work _because_ it use to work when the options were passed to external diff. It's not just -c that won't work, none of the other myriad external diff options will work either.

Show 5 quoted lines

> > Unless i've really missed something, the above documentation should be
> > reworked to remove mention of running diff altogether, and should mention
> > that the GIT_DIFF_OPTS only has two valid settings.
> 
> For now.

Well the documentation can be updated later if additional options are added.