From: Linus Torvalds Date: Fri, 14 Oct 2005 17:13:08 GMT Subject: Re: git-whatchanged does not show merge result? Message-ID: In-Reply-To: <4dd15d180510140933j7a730c49hb9cdaa98ea0a5b07@mail.gmail.com> On Fri, 14 Oct 2005, David Ho wrote: > > 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