magit-key-mode-popup-logging: add --grep= option

Setting this should also unset `--graph'.  Doing so requires
some big changes to the key-mode, so this will have to wait.
Merge branch 'grep'

Implements #739.
magit-merge: use git-merge options when calling git-commit
Merge remote branch origin/master'