From: David Ho <davidkwho@gmail.com>
Date: Fri, 14 Oct 2005 17:31:23 GMT
Subject: Re: git-whatchanged does not show merge result?
Message-ID: <4dd15d180510141031n531b9e0enc8e7d668b1e61b83@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0510141007290.23590@g5.osdl.org>

I was a little worried when I did git-whatchanged on a file and there
was a hole in the history where the merge is.  This reassured me that
all changes to the file is accessible (I'm sure they are all stored
safely in the repo =).

Thanks, David

On 10/14/05, Linus Torvalds <torvalds@osdl.org> wrote:
>
>
> 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
>