merge: Make '--log' an integer option for number of shortlog entries