git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* "git show" does not use diff.external like "git diff" does
@ 2010-12-28 15:10 Bruce Momjian
  2010-12-28 17:52 ` Junio C Hamano
  0 siblings, 1 reply; 3+ messages in thread
From: Bruce Momjian @ 2010-12-28 15:10 UTC (permalink / raw)
  To: git

I have diff.external configured properly, and it is used by "git diff",
but "git show" does not call the script and only returns unified diffs.

Is there a way to make "git show" use an external diff script?

-- 
  Bruce Momjian  <bruce@momjian.us>        http://momjian.us
  EnterpriseDB                             http://enterprisedb.com

  + It's impossible for everything to be true. +

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: "git show" does not use diff.external like "git diff" does
  2010-12-28 15:10 "git show" does not use diff.external like "git diff" does Bruce Momjian
@ 2010-12-28 17:52 ` Junio C Hamano
  2010-12-28 17:54   ` Bruce Momjian
  0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2010-12-28 17:52 UTC (permalink / raw)
  To: Bruce Momjian; +Cc: git

Bruce Momjian <bruce@momjian.us> writes:

> I have diff.external configured properly, and it is used by "git diff",
> but "git show" does not call the script and only returns unified diffs.
>
> Is there a way to make "git show" use an external diff script?

"git show --ext-diff"?

We end the Description section of the manual with "This manual page
describes only the most frequently used options." without explicitly
saying "Options from the underlying this and that commands can be given as
well", which is rather suboptimal.

The only existing hint there is one sentence before, "The command takes
options applicable to the git diff-tree command...", but the reader needs
to be both careful and vaguely familiar with the way the git command set
is structured to take advantage of that hint.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: "git show" does not use diff.external like "git diff" does
  2010-12-28 17:52 ` Junio C Hamano
@ 2010-12-28 17:54   ` Bruce Momjian
  0 siblings, 0 replies; 3+ messages in thread
From: Bruce Momjian @ 2010-12-28 17:54 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

Junio C Hamano wrote:
> Bruce Momjian <bruce@momjian.us> writes:
> 
> > I have diff.external configured properly, and it is used by "git diff",
> > but "git show" does not call the script and only returns unified diffs.
> >
> > Is there a way to make "git show" use an external diff script?
> 
> "git show --ext-diff"?
> 
> We end the Description section of the manual with "This manual page
> describes only the most frequently used options." without explicitly
> saying "Options from the underlying this and that commands can be given as
> well", which is rather suboptimal.
> 
> The only existing hint there is one sentence before, "The command takes
> options applicable to the git diff-tree command...", but the reader needs
> to be both careful and vaguely familiar with the way the git command set
> is structured to take advantage of that hint.

Yes, someone on IRC eventually suggested --ext-diff, and it does work. 
I was hoping for something that caused 'show' to always use --ext-diff,
like git diff does.  A git alias was the only suggested workaround.

-- 
  Bruce Momjian  <bruce@momjian.us>        http://momjian.us
  EnterpriseDB                             http://enterprisedb.com

  + It's impossible for everything to be true. +

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-12-28 17:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-28 15:10 "git show" does not use diff.external like "git diff" does Bruce Momjian
2010-12-28 17:52 ` Junio C Hamano
2010-12-28 17:54   ` Bruce Momjian

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 NNTP newsgroup(s).