Worth mentioning is "--first-parent" argument to git-log, which is usefull when using git-merge --no-ff to keep clean history with summary commits.

With "--first-parent", git-log only follows the left-hand (first) parent, thus listing the shortened history, by skipping over the right-hand ancestors of merge commits.