From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Thomas Rast <trast@student.ethz.ch>
Subject: Re: Understanding and improving --word-diff
Date: Wed, 10 Nov 2010 01:05:56 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.1.00.1011100102540.2226@bonsai2> (raw)
In-Reply-To: <20101109220136.GA5617@sigill.intra.peff.net>
Hi,
On Tue, 9 Nov 2010, Jeff King wrote:
> On Mon, Nov 08, 2010 at 04:16:01PM +0100, Matthijs Kooijman wrote:
>
> > E.g., I would like to see:
> >
> > -a <r>b</r> c
> > +a <g>x</g> c
> >
> > Unfortunately, all --word-diff types currently departs from line-based
> > - and + lines and show the new version of the file with the changed
> > words (both old and new versions) shown inline, marked with coloring
> > or {- ... -} kind of syntax. E.g., with --word-diff=color, the above
> > would look like:
> >
> > a <r>b</r><g>x</g> c
> >
> > Personally, I think that the first example above is easier to read
> > than the second one (at least for diffs of code).
>
> Yeah, as you figured out, word diff is really about formats that aren't
> line oriented.
Not really correct. While the _current_ way to show word diffs is
imitating GNU wdiff, the internal data structure does allow for more
sophisticated output.
Ciao,
Dscho
P.S.: Peff, I hope you're fine with me responding to the first sentence
only. After all, you know that my attention span is 7.2 seconds.
Some people taught me to put a smiley after such a statement, so: ;-)
next prev parent reply other threads:[~2010-11-10 0:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-08 15:16 Understanding and improving --word-diff Matthijs Kooijman
2010-11-08 15:41 ` Matthieu Moy
2010-11-08 15:49 ` Matthijs Kooijman
2010-11-08 16:33 ` Thomas Rast
2010-11-08 17:35 ` Wincent Colaiuta
2010-11-08 19:22 ` Thomas Rast
2010-11-09 22:01 ` Jeff King
2010-11-10 0:05 ` Johannes Schindelin [this message]
2010-11-10 4:17 ` Jeff King
2010-11-18 6:40 ` Jeff King
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=alpine.DEB.1.00.1011100102540.2226@bonsai2 \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox