From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 May 2011 16:37:41 +0000 (-0700)
Subject: Merge branch 'jk/cherry-pick-root-with-resolve' into maint
X-Git-Tag: v1.7.5.3~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0e66f8722c18194665084e85180bd9f3276f3960;p=git.git

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

* 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
---

0e66f8722c18194665084e85180bd9f3276f3960