Re: [Libreoffice] Git question again

Miklos Vajna <vmiklos -AT- frugalware.org>
Wed, 24 Nov 2010 23:14:28 +0100

On Wed, Nov 24, 2010 at 11:07:51PM +0100, Julien Nabet <serval2412@yahoo.fr> wrote:

Here what i've got :
serval@serval:~/libreoffice-source/build/clone$ git branch
* master
serval@serval:~/libreoffice-source/build/clone$ cd components/
serval@serval:~/libreoffice-source/build/clone/components$ git branch
* (no branch)
   master


That's it. Somehow you're not on a branch. I would try:

git rebase --abort

Under clone/components, and in case it says no rebase is in progress,
then just 'git checkout master', and finally re-try bin/g pull -r.

NOTE: /clone is part of build.git while /clone/components is
components.git. Any directory under components is also part of
components.git, so you just get the same output there.

Attachment: pgpuny5njTJpY.pgp
Description: PGP signature

Context

[Libreoffice] Git question again · Julien Nabet
- Re: [Libreoffice] Git question again · Miklos Vajna
  - Re: [Libreoffice] Git question again · Julien Nabet
    - Re: [Libreoffice] Git question again · Miklos Vajna
      - Re: [Libreoffice] Git question again · Julien Nabet
        
        Re: [Libreoffice] Git question again · Miklos Vajna
    - Re: [Libreoffice] Git question again · Wols Lists
- Re: [Libreoffice] Git question again · Wols Lists

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.