diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-17 13:50:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-17 13:50:28 -0700 |
| commit | 9c96637163ef26c7726e693984c2d4d9599d4e7e (patch) | |
| tree | 23ff95a0b958cb006f75f155a3aef4b54c320ec9 /git-mergetool--lib.sh | |
| parent | Merge branch 'js/early-config' (diff) | |
| parent | cherry-pick: detect bogus arguments to --mainline (diff) | |
| download | tgif-9c96637163ef26c7726e693984c2d4d9599d4e7e.tar.xz | |
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
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions