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

gitk: showing onging merge as such ?

From
Yann Dirson <ydirson@altern.org>
Date
May 7, 2009, 11:46 UTC
Message-ID
<53018.10.0.0.1.1241696812.squirrel@intranet.linagora.com>

While resolving a conflicted merge, I wondered if there was any reason why gitk does not show that we are indeed doing a merge, by showing the staged contents as a merge commit if MERGE_HEAD is found.

Is there any reason why we would not do this ?

I had a quick try at how this could be done, here it is. The diff is not yet displayed as combined.

Message 1 of 1 in “gitk: showing onging merge as such ?”
  1. Yann DirsonMay 7, 2009

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.