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

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

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Nov 8, 2010, 17:24 UTC
Message-ID
<20101108172421.GB3619@burratino>
In-Reply-To
<1289212979-64246-1-git-send-email-lists@haller-berlin.de>
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.

To be clear: this is a diff option (like -m but limited to one parent), not a history traversal option, right?

> 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...
Any ideas for addressing the space shortage?
Previous: Stefan HallerNext: Stefan Haller
Message 2 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.