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

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

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Oct 19, 2010, 13:20 UTC
Message-ID
<vpqbp6q9v4x.fsf@bauges.imag.fr>
In-Reply-To
<20101017015836.GC26656@burratino>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 11 quoted lines
> Thomas Rast wrote:
>
>> 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.
>
> I like this a lot.
+1, it's really a feature I was looking forward.
Show 7 quoted lines
> After this patch, the diff pane looks like this:
>
> ( ) Diff ( ) Old version ( ) New version   Lines of context: [3 +/-] \
> 	[ ] Ignore space changes  [ Line diff      v]
>
> all on one line.  In particular, it is easy not to notice the
> new dropdown.

Worse than that: if the window is not large enough, the select box "line diff/markup words/color words" is totally hidden. Is there a way to have the display wrap to 2 lines when the window is not large enough?

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Jonathan NiederNext: Paul Mackerras
Message 3 of 4 in “gitk: add the equivalent of diff --color-words”
  1. gitk: add the equivalent of diff --color-wordsThomas Rast, Oct 16, 2010
  2. Jonathan NiederOct 17, 2010
  3. Matthieu MoyOct 19, 2010
  4. Paul MackerrasDec 11, 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.