Francois Romieu <[EMAIL PROTECTED]> :
[...]
> [remote "origin"]
> url = git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
^^^
"net-2.6.25", sorry.
While reading the answers, I have the strange feeling
Joe Perches <[EMAIL PROTECTED]> :
[...]
> 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 resu
David Miller wrote:
> From: Joe Perches <[EMAIL PROTECTED]>
> 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
On Tue, 2007-12-11 at 19:09 -0200, Arnaldo Carvalho de Melo wrote:
> git-clone --reference linux-2.6
> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25
That works well. Just ~3MB in objects downloaded. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
From: Joe Perches <[EMAIL PROTECTED]>
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
>
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 rebase
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; f
From: David Miller <[EMAIL PROTECTED]>
Date: Tue, 11 Dec 2007 09:26:38 -0800 (PST)
> I want to work out all the conflicts now that Linus has pulled
> in my most recent batch of fixes.
>
> I hope to have it done in the next hour or so.
The rebase of net-2.6.25 is complete, sorry for taking
so lon
I want to work out all the conflicts now that Linus has pulled
in my most recent batch of fixes.
I hope to have it done in the next hour or so.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http:
