All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: git: how to produce context diffs?
Date: Mon, 27 Nov 2006 15:27:20 +0100	[thread overview]
Message-ID: <ekesgt$6jq$1@sea.gmane.org> (raw)
In-Reply-To: 200611271516.30425.bruno@clisp.org

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".
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git


  reply	other threads:[~2006-11-27 14:26 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 [this message]
2006-11-27 15:19   ` Sean
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='ekesgt$6jq$1@sea.gmane.org' \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.org \
    /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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.