[Calligra] 8792843: Merge branch 'master' of ssh://git.kde.org/calligr

[Cyrille Berger Skott]

Hi,

When pulling, run "git pull --rebase" this avoid those unnesserary commit. 
Merge should only be used when work in a branch is finished.

The difference between "git pull" + automatic merge and "git pull --rebase" is 
that rebase will replay your commits on top of the repository version.

On Thursday 09 December 2010, Matus Uzak wrote:
> commit 879284333e6f46475635cbc66a32b66a5c8fb1af
> branch master
> Merge: fb9b829 c3a1b56
> Author: Matus Uzak <matus.uzak at ixonos.com>
> Date:   Thu Dec 9 19:14:09 2010 +0100
> 
>     Merge branch 'master' of ssh://git.kde.org/calligra


-- 
Cyrille Berger Skott