On Fri, Jul 20, 2007 at 01:46:18AM +1000, Stephen Rothwell wrote:
> On Fri, 20 Jul 2007 01:44:32 +1000 Stephen Rothwell <[EMAIL PROTECTED]> wrote:
> >
> > git remote add powerpc
> > git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
> > git fetch powerpc
> >
> > This will track the
On Fri, Jul 20, 2007 at 01:44:32AM +1000, Stephen Rothwell wrote:
> On Thu, 19 Jul 2007 08:32:17 -0700 "Mark A. Greer" <[EMAIL PROTECTED]> wrote:
> >
> > I was in the master branch of powerpc.git and did a 'git-pull'
>
> Sorry, I hadn't updated since this afternoon. Looks like Paul has reset
> hi
On Fri, 20 Jul 2007 01:44:32 +1000 Stephen Rothwell <[EMAIL PROTECTED]> wrote:
>
> git remote add powerpc
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
> git fetch powerpc
>
> This will track the tree in branches called powerpc/ and do
> resets as necessary.
You should not m
On Thu, 19 Jul 2007 08:32:17 -0700 "Mark A. Greer" <[EMAIL PROTECTED]> wrote:
>
> I was in the master branch of powerpc.git and did a 'git-pull'
Sorry, I hadn't updated since this afternoon. Looks like Paul has reset
his master tree to be the same as Linus', so you do need to do a reset.
Or check
On Fri, Jul 20, 2007 at 01:27:08AM +1000, Stephen Rothwell wrote:
> Hi Mark,
>
> On Thu, 19 Jul 2007 08:17:46 -0700 "Mark A. Greer" <[EMAIL PROTECTED]> wrote:
> >
> > I did a git-pull this morning but it had a conflict. Should I have
> > reset it to something?
>
> What did you pull it into? The
Hi Mark,
On Thu, 19 Jul 2007 08:17:46 -0700 "Mark A. Greer" <[EMAIL PROTECTED]> wrote:
>
> I did a git-pull this morning but it had a conflict. Should I have
> reset it to something?
What did you pull it into? There were conflicts with Linus' tree in the
last merge, so there may be conflicts wi
Hi Paul,
I did a git-pull this morning but it had a conflict. Should I have
reset it to something?
Thanks,
Mark
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
