From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 May 2011 03:37:19 +0000 (-0700)
Subject: Merge branch 'jk/cherry-pick-root-with-resolve'
X-Git-Tag: v1.7.6-rc0~57
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6699c959efccc7cb969b87bdf8e0154a0fe9ccc8?hp=--cc

Merge branch 'jk/cherry-pick-root-with-resolve'

* jk/cherry-pick-root-with-resolve:
t3503: test cherry picking and reverting root commits
revert: allow reverting a root commit
cherry-pick: handle root commits with external strategies
---

6699c959efccc7cb969b87bdf8e0154a0fe9ccc8