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

Re: [PATCH] gitk: Add "First parent" checkbox

From
Paul Mackerras <paulus@samba.org>
Date
Dec 12, 2010, 04:27 UTC
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:
Show 10 quoted lines
> 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.
Previous: Stefan HallerNext: lists@haller-berlin.de
Message 8 of 9 in “gitk: Add "First parent" checkbox”
  1. gitk: Add "First parent" checkboxStefan Haller, Nov 8, 2010
  2. Jonathan NiederNov 8, 2010
  3. Stefan HallerNov 8, 2010
  4. Jonathan NiederNov 8, 2010
  5. Stefan HallerNov 8, 2010
  6. Jonathan NiederNov 8, 2010
  7. Stefan HallerNov 10, 2010
  8. Paul MackerrasDec 12, 2010
  9. gitk: Add "First parent" checkboxlists@haller-berlin.de, Dec 12, 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.