Git policy: git merge or git cherry-pick

[Lukast dev]

> git checkout master
> git merge flake-odf-gluepoints...
> git pull --rebase
> git push
>
> Ciao Jan

Thanks Jan.

I also did "git merge --log" with the branch with TOC feature.
That --log was suggested by boud, it shows more
verbose commit message.

For the nice commit message you need to
commit with commit messages like:

Introduction for the commit (~75 chars suggested by boud)
<new line>
More verbose description (unlimited most probably)