From: Arnaldo Carvalho de Melo <acme@redhat.com>
To: Joe Perches <joe@perches.com>
Cc: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Subject: Re: net-2.6.25 being rebased...
Date: Tue, 11 Dec 2007 19:09:11 -0200 [thread overview]
Message-ID: <20071211210911.GJ24046@ghostprotocols.net> (raw)
In-Reply-To: <1197407100.4911.150.camel@localhost>
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
next prev parent reply other threads:[~2007-12-11 21:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-11 17:26 net-2.6.25 being rebased David Miller
2007-12-11 19:56 ` David Miller
2007-12-11 21:04 ` Joe Perches
2007-12-11 21:08 ` David Miller
2007-12-11 21:31 ` Kok, Auke
2007-12-11 21:09 ` Arnaldo Carvalho de Melo [this message]
2007-12-11 21:23 ` Joe Perches
2007-12-11 21:35 ` Francois Romieu
2007-12-11 21:49 ` Francois Romieu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071211210911.GJ24046@ghostprotocols.net \
--to=acme@redhat.com \
--cc=davem@davemloft.net \
--cc=joe@perches.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.