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

Re: How to tell what paths changed in a merge?

From
PDPatrick Doyle <wpdster@gmail.com>
Date
Mar 29, 2011, 02:15 UTC
Message-ID
<AANLkTi=wRunp2KG94MQEvMDp+GM9uiZybM4LrUVOrAti@mail.gmail.com>
In-Reply-To
<20110329014814.GA4696@sigill.intra.peff.net>
On Mon, Mar 28, 2011 at 9:48 PM, Jeff King <peff@peff.net> wrote:
Show 6 quoted lines
> Try "git log -c --name-status" and "git log -m --name-status" to show
> the "combined" name-status and separate per-parent name-status
> respectively. Our default is not to show very much for merges, because
> it's a little more expensive to calculate and in the normal case, it
> ends up not being very interesting. Your case is not normal. :)
>
$ git log -m --name-status

looks like it will tell me what I'm looking for... (tomorrow when I'm more awake and in better shape to try tackling this).

Thanks for your help.
--wpd
Previous: Patrick Doyle
Message 4 of 4 in “How to tell what paths changed in a merge?”
  1. Patrick DoyleMar 28, 2011
  2. Jeff KingMar 28, 2011
  3. Fwd: How to tell what paths changed in a merge?Patrick Doyle, Mar 29, 2011
  4. Patrick DoyleMar 29, 2011

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.