git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Ho <davidkwho@gmail.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: git-whatchanged does not show merge result?
Date: Fri, 14 Oct 2005 13:31:23 -0400	[thread overview]
Message-ID: <4dd15d180510141031n531b9e0enc8e7d668b1e61b83@mail.gmail.com> (raw)
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
>

  reply	other threads:[~2005-10-14 17:31 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <4dd15d180510140929x2c69f61ag19a1409cfd993e7b@mail.gmail.com>
2005-10-14 16:33 ` git-whatchanged does not show merge result? David Ho
2005-10-14 17:13   ` Linus Torvalds
2005-10-14 17:31     ` David Ho [this message]
2005-10-14 18:39       ` Linus Torvalds
2005-10-14 17:24   ` Junio C Hamano
2005-10-14 17:39     ` David Ho

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4dd15d180510141031n531b9e0enc8e7d668b1e61b83@mail.gmail.com \
    --to=davidkwho@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).