From: Sean <seanlkml@sympatico.ca>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git: how to produce context diffs?
Date: Mon, 27 Nov 2006 10:19:49 -0500 [thread overview]
Message-ID: <BAYC1-PASMTP01B6529D1821EEBC0A6E6FAEE60@CEZ.ICE> (raw)
In-Reply-To: <ekesgt$6jq$1@sea.gmane.org>
On Mon, 27 Nov 2006 15:27:20 +0100
Jakub Narebski <jnareb@gmail.com> wrote:
> Bruno Haible wrote:
>
> > Is this a bug in git-diff? The git-diff-files.html says:
> >
> > " When the environment variable GIT_EXTERNAL_DIFF is not set ...
> > For example, if you prefer context diff:
> > GIT_DIFF_OPTS=-c git-diff-index -p HEAD "
> >
> > This doesn't work for me with git-1.4.4:
>
> Yes, the bug in documentation, I think. There is an option '-c' to git-diff,
> but it means "combined diff" (for merges), not "context diff".
Indeed. That documentation predates built-in diff completely.
It appears the only valid options now are "-u XX" and "--unified=XX".
These options are never passed to diff, but rather used to control
the internal diff. Strangely, it appears that gitk is even passing
incorrect parameters via GIT_DIFF_OPTS.
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.
next prev parent reply other threads:[~2006-11-27 15:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-27 14:16 git: how to produce context diffs? Bruno Haible
2006-11-27 14:27 ` Jakub Narebski
2006-11-27 15:19 ` Sean [this message]
2006-11-27 16:05 ` Jakub Narebski
2006-11-27 17:06 ` Sean
2006-11-27 15:38 ` Sean
2006-11-27 18:33 ` Thomas Kolejka
2006-11-27 19:18 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BAYC1-PASMTP01B6529D1821EEBC0A6E6FAEE60@CEZ.ICE \
--to=seanlkml@sympatico.ca \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).