From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Mar 2017 20:50:28 +0000 (-0700)
Subject: Merge branch 'jk/cherry-pick-0-mainline'
X-Git-Tag: v2.13.0-rc0~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c96637163ef26c7726e693984c2d4d9599d4e7e;p=thirdparty%2Fgit.git

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
---

9c96637163ef26c7726e693984c2d4d9599d4e7e