[Libreoffice] Git server-side hooks

[Kohei Yoshida]

On Fri, 2010-11-19 at 12:31 +0000, Michael Meeks wrote:
>         We should be using 'git merge'

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... :-/

Kohei

-- 
Kohei Yoshida, LibreOffice hacker, Calc
<kyoshida at novell.com>