From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jul 2011 02:21:01 GMT
Subject: Re: git show-branch --topics and merge commits
Message-ID: <7v8vrwl46q.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CA+6x0LWXz-SpnZjdiV3UKJzUz3+0LiMOsbZHTn2gJ+v6bPGndA@mail.gmail.com>

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").