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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, Jul 17, 2011 at 10:21 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Mike Shal <marfey@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]