From: Jakub Narebski Date: Sun, 07 Nov 2010 11:52:39 GMT Subject: Re: merge two local mirrors with detached heads and similar remotes Message-ID: In-Reply-To: Zenaan Harkness writes: > --------- > 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). > 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