git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git: how to produce context diffs?

From
Jakub Narebski <jnareb@gmail.com>
Date
Nov 27, 2006, 14:27 UTC
Message-ID
<ekesgt$6jq$1@sea.gmane.org>
In-Reply-To
<200611271516.30425.bruno@clisp.org>
Bruno Haible wrote:
Show 7 quoted lines
> 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
Previous: Bruno HaibleNext: Sean
Message 2 of 8 in “git: how to produce context diffs?”
  1. Bruno HaibleNov 27, 2006
  2. Jakub NarebskiNov 27, 2006
  3. SeanNov 27, 2006
  4. Jakub NarebskiNov 27, 2006
  5. SeanNov 27, 2006
  6. SeanNov 27, 2006
  7. Thomas KolejkaNov 27, 2006
  8. Junio C HamanoNov 27, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.