Re: [Libreoffice] Git server-side hooks

Miklos Vajna <vmiklos -AT- frugalware.org>
Sat, 20 Nov 2010 00:26:26 +0100

On Fri, Nov 19, 2010 at 11:03:21AM -0500, Kohei Yoshida <kyoshida@novell.com> wrote:

So, part of the problem was that I was always using git pull, even where
git merge would've been appropriate.

To be honest, I didn't even know of 'git merge' until now.  I always
thought pull was merge in git universe... :-/


Don't worry, in the past there were no git merge, and just pull. :) Then
later it got split to fetch + merge to make git more distributed (fetch
is always a trivial operation, then you can merge whenever you want,
even when you're offline). :)

Attachment: pgpgZf1VC9VCI.pgp
Description: PGP signature

Context

Re: [Libreoffice] Git server-side hooks (continued)
- Re: [Libreoffice] Git server-side hooks · Kohei Yoshida
  - Re: [Libreoffice] Git server-side hooks · Miklos Vajna
    - Re: [Libreoffice] Git server-side hooks · Kohei Yoshida
      - Re: [Libreoffice] Git server-side hooks · Jan Holesovsky
        
        Re: [Libreoffice] Git server-side hooks · Miklos Vajna
      - Re: [Libreoffice] Git server-side hooks · Miklos Vajna
      - Re: [Libreoffice] Git server-side hooks · Michael Meeks
        
        Re: [Libreoffice] Git server-side hooks · Miklos Vajna
        
        Re: [Libreoffice] Git server-side hooks · Kohei Yoshida
        
        Re: [Libreoffice] Git server-side hooks · Kohei Yoshida
        
        Re: [Libreoffice] Git server-side hooks · Miklos Vajna

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.