Maybe you can ignore merges when counting number of commits, as these rarely contribute code themselves?