paulus at samba.org
Sun Jan 15 17:07:57 EST 2006
will schmidt writes:
> Paul Mackerras wrote:
> > That means that anyone who is following the powerpc.git tree by doing
> > pulls periodically will need to reset their tree too. Otherwise each
> > pull will do an unnecessary merge.
> Hi Paul,
> By reset, do you mean to delete the local tree and pull a fresh
> one, or something fancier?
The powerpc.git tree is now identical to Linus' tree as of a day or so
ago. There are several ways you can reset your tree:
- make a fresh clone of Linus' tree, and make its .git/remotes/powerpc
point at the powerpc.git tree on kernel.org, or
- do "git fetch -f powerpc" (substitute whatever remote name you use
for the powerpc.git tree) (according to Stephen Rothwell), or
- do a pull as you would normally do, then throw away the merge and
the extra objects by doing:
git reset --hard FETCH_HEAD
- or you can delete the local tree and do a fresh clone.
I will start putting stuff in powerpc.git in the next day or so.
More information about the Linuxppc-dev