git problems with kernel drm repository

garrone pgarrone at
Sat Dec 13 21:39:26 PST 2008

On Sat, Dec 13, 2008 at 04:38:25PM -0800, Eric Anholt wrote:
> You don't do git pull on kernel repositories other than linus, because
> we all have to rebase onto linus.  git fetch, then if you have nothing
> of value in your branch, then git-reset --hard anholt/drm-intel-next.
> Otherwise, git-rebase anholt/drm-intel-next and lots of git-rebase
> --skip.

Thanks. I have discovered where downloaded branches are stored, the
difference between fetch and merge, and how to apply the hard reset.
Hopefully the "origin/drm-intel-next" branch represents accurately the
source archive, and a git diff with that branch is accurate.

More information about the xorg mailing list