added --no-merges to git log-s