nptl branch going away, use nptl_merge

[Carmelo AMOROSO]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Rob Landley wrote:
> On Monday 23 November 2009 12:14:07 Austin Foxley wrote:
>> On 11/23/2009 01:23 AM, Bernhard Reutner-Fischer wrote:
>>> Good idea.
>>> Is there something preventing a rename of nptl_merge -> nptl now?
>> Done. nptl_merge is now nptl.
>>
>> -Austin
> 
> Confused.  I'm testing via:
> 
> git archive --prefix=uClibc/ origin/nptl_merge | bzip2 > ~/test-uClibc.tar.bz2
> 
> I just did a "git pull", followed by "git branch -a", and it shows:
> 
> * master
>   origin/0_9_28
>   origin/0_9_29
>   origin/0_9_30
>   origin/HEAD
>   origin/master
>   origin/nptl
>   origin/nptl_merge
>   origin/old_nptl
> 
> I don't know which branch is what at this point.  I take it the easy way to fix 
> this is to "rm -rf ~/uclibc/git" and re-check-out the whole mess?
> 
> Rob
> 
> (I really hate git.)

#git remote prune origin

will do the work for you. Use --dry-run to see what it will prune without
actually pruning. Hope it helps.

Carmelo



-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAksWfygACgkQoRq/3BrK1s831gCg+govUEgDLfQao8q5LPP9UDKf
CNcAoJYOTzUkUtmghU0QkMGQZQdch2xa
=1lMT
-----END PGP SIGNATURE-----