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

[PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.

From
Jon Seymour <jon.seymour@gmail.com>
Date
Mar 29, 2010, 23:00 UTC
Message-ID
<2cfc40321003291600q70f0839bt8720dd025a3891f6@mail.gmail.com>

Resending because my original patch series wasn't whitespace clean and I have now removed the configuration to make the safe behaviour optional - it is not safe by default.

If there is any other reason why this patch should not be considered, please let me know.

[PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to encapsulate its derivation. [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in the case of conflicts.

jon.
Next: Jon Seymour
Message 1 of 5 in “git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.”
  1. 0/2 git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.Jon Seymour, Mar 29, 2010
  2. Jon SeymourMar 29, 2010
  3. Jon SeymourMar 29, 2010
  4. Johannes SixtMar 30, 2010
  5. 0/2 git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.Jon Seymour, Mar 30, 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.