Re: net-2.6.25 being rebased...

["Kok, Auke" <auke-jan.h.kok@intel.com>]

David Miller wrote:
> From: Joe Perches <joe@perches.com>
> Date: Tue, 11 Dec 2007 13:04:59 -0800
> 
>> 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.
> 
> Easiest thing to do is do a quick local clone of Linus's current tree
> (you do have one of these around right? :-) and then pull in from the
> rebased tree.
> 
> bash$ git clone linux-2.6/.git net-2.6.25
> bash$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25.git

I often have success without recloning by doing:

$ git-reset --hard v2.6.23
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25.git

saves you the time to reclone. As long as you reset below the rebase point, this
should be OK.

Auke