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

Re: [PATCH v4 3/3] gitk: add the equivalent of diff --color-words

From
Paul Mackerras <paulus@samba.org>
Date
Apr 17, 2010, 06:35 UTC
Message-ID
<20100417063557.GB6681@brick.ozlabs.ibm.com>
In-Reply-To
<bc720738f918f0523842b3839b7e611c453b5241.1271260308.git.trast@student.ethz.ch>
On Wed, Apr 14, 2010 at 05:59:08PM +0200, Thomas Rast wrote:
Show 14 quoted lines
> Use the newly added 'diff --word-diff=porcelain' to teach gitk a
> color-words mode, with two different modes analogous to the
> --word-diff=plain and --word-diff=color settings.  These are selected
> by a dropdown box.
> 
> As an extra twist, automatically enable this word-diff support when
> the user mentions a word-diff related option on the command line.
> These options were previously ignored because they would break diff
> parsing.
> 
> Both of these features are only enabled if we have a version of git
> that supports --word-diff=porcelain, tentatively set to 1.7.2.
> 
> Signed-off-by: Thomas Rast <trast@student.ethz.ch>

Looks fine. The only nit I can see is that a "--word-diffoobar" option would get treated as "--word-diff=plain" rather than giving an error or being passed as-is to git log.

When does this need to go in, i.e. when is the git patch likely to go in?

Paul.
Previous: Thomas RastNext: Junio C Hamano
Message 10 of 11 in “git-diff --word-diff/gitk --color-words”
  1. 0/3 git-diff --word-diff/gitk --color-wordsThomas Rast, Apr 14, 2010
  2. 1/3 diff: add --word-diff option that generalizes --color-wordsThomas Rast, Apr 14, 2010
  3. Junio C HamanoApr 14, 2010
  4. 2/3 gitk: do not parse " >" context as submodule changeThomas Rast, Apr 14, 2010
  5. Jens LehmannApr 15, 2010
  6. Paul MackerrasApr 17, 2010
  7. Thomas RastApr 17, 2010
  8. Paul MackerrasApr 19, 2010
  9. 3/3 gitk: add the equivalent of diff --color-wordsThomas Rast, Apr 14, 2010
  10. Paul MackerrasApr 17, 2010
  11. Junio C HamanoApr 17, 2010

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.