From: Paul Mackerras <paulus@samba•org>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Linux Kernel Development <linux-kernel@vger•kernel.org>,
linux-next@vger•kernel.org
Subject: Re: Diagnosing linux-next (Was: Re: m68k libc5 regression)
Date: Mon, 2 Jun 2008 15:49:59 +1000 [thread overview]
Message-ID: <18499.35335.408967.918602@cargo.ozlabs.ibm.com> (raw)
In-Reply-To: <20080601223758.627e96e8.akpm@linux-foundation.org>
Andrew Morton writes:
> On Mon, 2 Jun 2008 12:12:29 +1000 Paul Mackerras <paulus@samba•org> wrote:
> > There's now a facility for viewing diffs in an external viewer. If
> > you do Edit->Preferences and set the "External diff tool" thing to
> > tkdiff, then you can right-click on a file name in the file list
> > (bottom right-hand pane) and select "External diff" and it will launch
> > tkdiff to show you the diffs for that file.
>
> <upgrades>
>
> OK, that works, thanks. Right-clicking on each file is the sole way to
> bring it up?
At the moment, yes. Do you want something different?
> > What is it you like about tkdiff? Is it the side-by-side display, or
> > the highlighting of differences within a line, or the merge facility?
>
> I like the side-by-side display. I hardly look at the left (previous) side
> at all - it's a good way of seeing the change in a larger context.
I see. There are a couple of features in gitk you might find useful,
then: you can get the gitk diff window to display just the new
version (or just the old version) using the radio buttons just above
the diff pane. You can also get it to show more context with the
spinbox to the right of the radio buttons.
Something that dirdiff can do is to let you pick up the separator line
and drag it upwards or downwards to see more context. Maybe I should
add that to gitk too.
Paul.
next prev parent reply other threads:[~2008-06-02 5:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <Pine.LNX.4.64.0805262226280.11902@anakin>
[not found] ` <Pine.LNX.4.64.0805270014110.6718@jikos.suse.cz>
[not found] ` <20080601005338.3affe880.akpm@linux-foundation.org>
2008-06-01 13:26 ` Diagnosing linux-next (Was: Re: m68k libc5 regression) Stephen Rothwell
2008-06-01 21:04 ` Andrew Morton
2008-06-02 0:39 ` Paul Mackerras
2008-06-02 1:06 ` Andrew Morton
2008-06-02 2:12 ` Paul Mackerras
2008-06-02 5:37 ` Andrew Morton
2008-06-02 5:49 ` Paul Mackerras [this message]
2008-06-02 6:22 ` Andrew Morton
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=18499.35335.408967.918602@cargo.ozlabs.ibm.com \
--to=paulus@samba$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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