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

Re: [PATCH] Offer to print changes while running git-mergetool

From
Jonathan del Strother <maillist@steelskies.com>
Date
Feb 6, 2009, 14:41 UTC
Message-ID
<57518fd10902060641pa789ffbjceccbf013864e0a5@mail.gmail.com>
In-Reply-To
<1233930745-77930-1-git-send-email-jon.delStrother@bestbefore.tv>

On Fri, Feb 6, 2009 at 2:32 PM, Jonathan del Strother <jon.delStrother@bestbefore.tv> wrote:

> Add a "Show changes" option to each prompt in mergetool. This prints the conflicted changes on the current file, using 'git log -p --merge <file>'

Just discovered that this doesn't work so well when resolving merges resulting from "git stash apply" - it produces "fatal: --merge without MERGE_HEAD". Should git-stash be setting MERGE_HEAD in this case, or should I be using something other than 'git log --merge' to cover these sorts of cases?

Previous: Jonathan del StrotherNext: Junio C Hamano
Message 2 of 10 in “Offer to print changes while running git-mergetool”
  1. Offer to print changes while running git-mergetoolJonathan del Strother, Feb 6, 2009
  2. Jonathan del StrotherFeb 6, 2009
  3. Junio C HamanoFeb 6, 2009
  4. Jonathan del StrotherFeb 6, 2009
  5. Junio C HamanoFeb 7, 2009
  6. Junio C HamanoFeb 7, 2009
  7. Jonathan del StrotherFeb 7, 2009
  8. Charles BaileyFeb 8, 2009
  9. Jonathan del StrotherFeb 8, 2009
  10. Charles BaileyFeb 8, 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.