Question on git merge patch

[Michel Dänzer]

On Mit, 2011-10-12 at 11:10 +0800, Huang, FrankR wrote: 
> Hi, 
> 	I have a question to ask you guys.
> 	For example:
> 	
> http://cgit.freedesktop.org/~airlied/linux/commit/drivers/gpu/drm/radeon
> /evergreen.c?id=f7eb0c55416aba7478932cedbaccc2bdacd8a95d
> 	There merge has two parents and two diff. I want to ask the
> second diff:
> 	
> http://cgit.freedesktop.org/~airlied/linux/diff/drivers/gpu/drm/radeon/e
> vergreen.c?id=f7eb0c55416aba7478932cedbaccc2bdacd8a95d&id2=439bd6cde45d0
> bff4f97513b01b976b9f72ae1f0

This diff looks wrong, maybe a cgit bug.

> 	Does it come from branch drm-radeon-fusion? If that is so, is it
> a local branch? Because I can not access a branch named
> drm-radeon-fusion. How could I find this patch's log?

Its history became part of the drm-radeon-next history with the above
merge commit. 

I find it easier to look at this sort of thing in gitk. E.g.

gitk 27641c3f003e7f3b6585c01d8a788883603eb262..f7eb0c55416aba7478932cedbaccc2bdacd8a95d

nicely shows the histories of the two branches merged by the above
commit from when they originally diverged.


Hope this helps,


-- 
Earthling Michel Dänzer           |                   http://www.amd.com
Libre software enthusiast         |          Debian, X and DRI developer