Merge branch 'ss/cherry-pick-x-doc'
commit3340f60483e4ccb74db5d0eb453396322c2962aa
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 22:51:35 +0000 (4 15:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 22:51:35 +0000 (4 15:51 -0700)
tree923ee9affb633b4e1ac45b129e763d91899e9b53
parent0cb09a7e0c91725c9ac926f1b6767dce597d19dd
parentbea7d16e8b8248602ea033b188f862699af4b977
Merge branch 'ss/cherry-pick-x-doc'

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