Re: Questions about branches in git

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Jan 28, 2010, 23:00 UTC
Message-ID: <46a038f91001281500x5088206akb7390dec8839a169@mail.gmail.com>
In-Reply-To: <69b754db1001281044y39e52f77hcc8f83144776c78f@mail.gmail.com>

On Thu, Jan 28, 2010 at 7:44 PM, Mike Linck <mgl@absolute-performance.com> wrote:

> I've looked through as much documentation as I can find about git show
> and git log, and I've played around with git rebase to try to apply
> changes to multiple places, but I have not been able to find a way to
> display the commits relevant to a particular bug/topic branch.

I've done a similar job for quite a while, and kernel hackers need that all the time too. If the branches merge a lot, what you need to know is what patches are only on one side, and not on the other. Two things to the rescue:

 - the "3 dots" "..." separator. try with gitk and git log:
    git log mybranch...hisbranch
    git log hisbranch...mybranch

 - git am (which is part of the rebase machinery) does the same as the
"..." operator, but has additional tricks to try and spot commits that
have been cherry picked. So I would often export patches with git am
just to review what' s on one side.

hth,

-- 
 martin.langhoff@gmail.com
 martin@laptop.org -- School Server Architect
 - ask interesting questions
 - don't get distracted with shiny stuff  - working code first
 - http://wiki.laptop.org/go/User:Martinlanghoff