Re: net-2.6.25 being rebased...

[Francois Romieu <romieu@fr.zoreil.com>]

Joe Perches <joe@perches.com> :
[...]
> 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.

Assuming taht you initially cloned from davem's repo, your .git/config
could contain something along the lines of:

 [remote "origin"]
         url = git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
         fetch = +refs/heads/*:refs/remotes/origin/*

(the "+" will update even non fast-forwarding branches)

Then:

$ git fetch origin
$ git fetch -u remotes/origin/master:master

You may then reset --hard to wipe out any leftover file.

If you cloned from somewhere else, replace "origin" with the label of
your choice to automate the process.

-- 
Ueimor