Re: git show-branch --topics and merge commits

From: Mike Shal <marfey@gmail.com>
Date: Jul 18, 2011, 03:37 UTC
Message-ID: <CA+6x0LXHKZgvW4_hWz8qrWQshqxB3pQ-=08itqnV5smA_NCrBA@mail.gmail.com>
In-Reply-To: <7v8vrwl46q.fsf@alter.siamese.dyndns.org>

On Sun, Jul 17, 2011 at 10:21 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 13 quoted lines

> Mike Shal <marfey@gmail.com> writes:
>
>> So rev-list shows my merge commit and the 'new' commit, but
>> show-branch --topics doesn't show 'new'. Is this the expected
>> behavior?
>
> Yes, show-branch was specifically written for people with strict sense of
> project hygiene who do not merge into their topic from upstream (which
> would turn the branch from "place to hold commits on this topic" into
> "place to hold commits on this topic and unrelated random changes made in
> upstream").
>
>

Ok, makes sense. Is 'git rev-list' supposed to give the same list of commits then? In my example, rev-list shows the commit on the branch even after upstream has been merged in. My confusion comes from this line in the man page of git-show-branch:

   When given "git show-branch --topics master topic1 topic2", this
will show the revisions given by "git rev-list ^master topic1 topic2"

Thanks again, -Mike