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

Re: git-whatchanged does not show merge result?

From
Linus Torvalds <torvalds@osdl.org>
Date
Oct 14, 2005, 17:13 UTC
Message-ID
<Pine.LNX.4.64.0510141007290.23590@g5.osdl.org>
In-Reply-To
<4dd15d180510140933j7a730c49hb9cdaa98ea0a5b07@mail.gmail.com>
On Fri, 14 Oct 2005, David Ho wrote:
Show 5 quoted lines
> 
> Maybe someone can clear up a confusion I have with git-whatchanged.
> I created a new repo with just one file hello, split out a new branch "mybranch.
> When I merged back the changes from mybranch, git-whatchanged -p did
> not should the diff of the merge.

You can use the "-m" flag to show merges. HOWEVER, it's not very useful in general, although it _is_ useful on a file-by-file basis.

What "-m" does is that it will show diffs against each parent, which is _sometimes_ what you want. Try it.

		Linus
Previous: David HoNext: David Ho
Message 2 of 6 in “Re: git-whatchanged does not show merge result?”
  1. David HoOct 14, 2005
  2. Linus TorvaldsOct 14, 2005
  3. David HoOct 14, 2005
  4. Linus TorvaldsOct 14, 2005
  5. Junio C HamanoOct 14, 2005
  6. David HoOct 14, 2005

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.