From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Thomas Rast <trast@student.ethz.ch>,
Paul Mackerras <paulus@samba.org>,
git@vger.kernel.org, Pat Thoyts <patthoyts@users.sourceforge.net>
Subject: Re: [PATCH] gitk: add the equivalent of diff --color-words
Date: Tue, 19 Oct 2010 15:20:30 +0200 [thread overview]
Message-ID: <vpqbp6q9v4x.fsf@bauges.imag.fr> (raw)
In-Reply-To: <20101017015836.GC26656@burratino> (Jonathan Nieder's message of "Sat\, 16 Oct 2010 20\:58\:36 -0500")
Jonathan Nieder <jrnieder@gmail.com> writes:
> 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.
> 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/
next prev parent reply other threads:[~2010-10-19 13:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-16 10:15 [PATCH] gitk: add the equivalent of diff --color-words Thomas Rast
2010-10-17 1:58 ` Jonathan Nieder
2010-10-19 13:20 ` Matthieu Moy [this message]
2010-12-11 23:48 ` Paul Mackerras
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqbp6q9v4x.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=patthoyts@users.sourceforge.net \
--cc=paulus@samba.org \
--cc=trast@student.ethz.ch \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).