From: Paul Mackerras <paulus@samba.org>
Date: Sun, 12 Dec 2010 04:27:32 GMT
Subject: Re: [PATCH] gitk: Add "First parent" checkbox
Message-ID: <20101212042732.GA7296@brick.ozlabs.ibm.com>
In-Reply-To: <1289212979-64246-1-git-send-email-lists@haller-berlin.de>

On Mon, Nov 08, 2010 at 11:42:59AM +0100, Stefan Haller wrote:
> Sometimes it's desirable to see what changes were introduced by a
> merge commit, rather than how conflicts were resolved. This adds
> a checkbox which, when turned on, makes gitk show the equivalent
> of "git show --first-parent <commit>" for merge commits.
> 
> Signed-off-by: Stefan Haller <stefan@haller-berlin.de>
> ---
> I realize this conflicts with Thomas Rast's recent patch to
> add a word-diff dropdown box; things are fighting for space
> in the diff pane header...

I just applied Thomas Rast's patch, so you'll need to rebase.  Also
you're right that we're running out of space; perhaps we need to make
the pane header two rows high.  Finally, "First parent" doesn't really
convey to me immediately what it does -- I have to think about it, so
it will probably confuse new users.  I don't know what would be
better, though.

Paul.