projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 71c3a4f b16a991)
Merge branch 'jk/cherry-pick-0-mainline' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Mar 2017 20:26:12 +0000 (13:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Mar 2017 20:26:12 +0000 (13:26 -0700)
commite9a888e5c4472d200e3245a577e3746bca378938
tree9fbde0bc7c993769097930b266f8e61a2c79e465tree | snapshot
parent71c3a4f4ba376658589b3a1ab0ef85fab57c3094commit | diff
parentb16a991c1be5681b4b673d4343dfcc0c2f5ad498commit | diff
Merge branch 'jk/cherry-pick-0-mainline' into next

"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
builtin/revert.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.