]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a0393a2 b16a991)
Merge branch 'jk/cherry-pick-0-mainline'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Mar 2017 20:50:28 +0000 (13:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Mar 2017 20:50:28 +0000 (13:50 -0700)
commit9c96637163ef26c7726e693984c2d4d9599d4e7e
tree23ff95a0b958cb006f75f155a3aef4b54c320ec9tree | snapshot
parenta0393a298fecff8cdc17aba51245f29433520d81commit | diff
parentb16a991c1be5681b4b673d4343dfcc0c2f5ad498commit | diff
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
builtin/revert.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.