Re: [Libreoffice] Git question again

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

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

Now i have this :
serval@serval:~/libreoffice-source/build/clone/components$ git branch
* (no branch)
   master
serval@serval:~/libreoffice-source/build/clone/components$ git rebase 
--abort
HEAD is now at eb24b6e RTL patch
serval@serval:~/libreoffice-source/build/clone/components$ git checkout 
master
Already on 'master'
Your branch and 'origin/master' have diverged,
and have 3 and 13 different commit(s) each, respectively.
serval@serval:~/libreoffice-source/build/clone/components$


Sounds good, use bin/g pull -r now. If you need further help, consider
joining #libreoffice on IRC so that we don't spam all the people on this
list. :)

Attachment: pgpqGP9DsuQSc.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.