Messages in this thread | | | Date | Wed, 29 Jan 2014 20:54:03 -0800 | Subject | Re: [git pull] drm next tree | From | Linus Torvalds <> |
| |
On Wed, Jan 29, 2014 at 6:49 PM, Dave Airlie <airlied@linux.ie> wrote: > > For some reason the request-pull and the merge into your tree look different, > since some of the changes in this have already gone in via the arm-soc tree > and dma stuff, all for tegra. Hopefully nobody rebased when they shouldn't.
Looks more like it's just a few cross-merges, which then ends up meaning that there are multiple merge-bases and not just one common ancestor commit.
In that case, a simple "git diff" can't do a great job, and the actual merge diff will usually end up different.
Linus
| |