From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 May 2011 22:51:35 +0000 (-0700)
Subject: Merge branch 'ss/cherry-pick-x-doc'
X-Git-Tag: v1.7.6-rc0~116
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3340f60483e4ccb74db5d0eb453396322c2962aa;p=git.git

Merge branch 'ss/cherry-pick-x-doc'

* ss/cherry-pick-x-doc:
  doc: Clarify that "cherry-pick -x" does not use "git notes"
---

3340f60483e4ccb74db5d0eb453396322c2962aa