Re: merge two local mirrors with detached heads and similar remotes

From: Jakub Narebski <jnareb@gmail.com>
Date: Nov 7, 2010, 11:52 UTC
Message-ID: <m3vd49fj1k.fsf@localhost.localdomain>
In-Reply-To: <AANLkTi=JmpXEiEe-7-ZicUp-QosWjTZQgK77-f=9iAtL@mail.gmail.com>

Zenaan Harkness <zen@freedbms.net> writes:

Show 9 quoted lines

> ---------
> Looks very much like success to me. Small thing I notice is this line:
>   remotes/origin/HEAD -> origin/master
> 
> has become this:
>   remotes/lach/HEAD
> 
> (ie it's not a link any more - probably not particularly relevant,
> perhaps git gc would automate tidying this?)

It might be detached head: you can check it by using

  $ git rev-parse --symbolic-full-name remotes/lach/HEAD

If it is 'remotes/lach/HEAD' or 'HEAD', it is detached HEAD (unnamed branch).

Show 5 quoted lines

> Should something like Junio's tutorial go into
> Documentation/gitworkflows.xml(ARGGH!) ?
> If not, where else?
> Is there anything besides vim (about all I know) you can recommend for
> editing xml(ARGGH!) docs?

Documentation/gitworkflows.txt is source of XML, HTML, info and manpage versions - please edit source (in AsciiDoc), and not generated documentation.

-- 
Jakub Narebski
Poland
ShadeHawk on #git