Em Tue, Dec 11, 2007 at 01:04:59PM -0800, Joe Perches escreveu: > On Tue, 2007-12-11 at 11:56 -0800, David Miller wrote: > > The rebase of net-2.6.25 is complete > > I have an earlier unmodified git repository of net-2.6.25. > Does anyone know the appropriate git commands to resync > to the rebased content? > > $ git branch > * master > $ git-pull > [...] > Automatic merge failed; fix conflicts and then commit the result.
rm -rf net-2.6.25 git-clone --reference linux-2.6 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25 Assuming you have linux-2.6 cloned from Linus. Dave may have removed patches, combined some, whatever, so I just do the above procedure when I don't have any pending csets on my local net-2.6.25 tree. - Arnaldo -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
