[Libreoffice] Git server-side hooks

[Miklos Vajna]

On Fri, Nov 19, 2010 at 11:03:21AM -0500, Kohei Yoshida <kyoshida at 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). :)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20101120/724b162c/attachment-0001.pgp>