> For future: "git pull --rebase" please to not create merge commits. Right. Point taken. Actually the merge was not wrong or horrible in the end, I was just scared by the very bg diffstat I was seeing. Still, I should have rebased before pushing. My apologies. spaetz