[Digikam-devel] please avoid "merge" commits!!

[Matthias Welwarsky]

Hello,

99f28d0 Merge branches 'master' and 'master' of git://anongit.kde.org/digikam

and 

2ea3bd8 Merge branch 'master' of git://anongit.kde.org/digikam

Please avoid that. The history becomes unreadable and if you merge a feature 
branch with a lot of commits it becomes very difficult to find regressions 
with git bisect, because it cannot descent into the branch that was merged.

Therefore:
- always use "git pull --rebase" when you update from origin,
- if you accitendally forgot, use "git rebase origin/<branchname>" before "git 
push origin <branchname>" to clean up.

regards,
matthias