tree 23ff95a0b958cb006f75f155a3aef4b54c320ec9
parent a0393a298fecff8cdc17aba51245f29433520d81
parent b16a991c1be5681b4b673d4343dfcc0c2f5ad498
author Junio C Hamano <gitster@pobox.com> 1489783828 -0700
committer Junio C Hamano <gitster@pobox.com> 1489783828 -0700

Merge branch 'jk/cherry-pick-0-mainline'

"git revert -m 0 $merge_commit" complained that reverting a merge
needs to say relative to which parent the reversion needs to
happen, as if "-m 0" weren't given.  The correct diagnosis is that
"-m 0" does not refer to the first parent ("-m 1" does).  This has
been fixed.

* jk/cherry-pick-0-mainline:
  cherry-pick: detect bogus arguments to --mainline