| commit | 9c96637163ef26c7726e693984c2d4d9599d4e7e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 17 Mar 2017 20:50:28 +0000 (17 13:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 17 Mar 2017 20:50:28 +0000 (17 13:50 -0700) | ||
| tree | 23ff95a0b958cb006f75f155a3aef4b54c320ec9 | treesnapshot (tar.gz zip) |
| parent | a0393a298fecff8cdc17aba51245f29433520d81 | commitdiff |
| parent | b16a991c1be5681b4b673d4343dfcc0c2f5ad498 | commitdiff |
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
"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 | blobhistory |