Merge branch 'ss/cherry-pick-x-doc'
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 22:51:35 +0000 (15:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 22:51:35 +0000 (15:51 -0700)
* ss/cherry-pick-x-doc:
  doc: Clarify that "cherry-pick -x" does not use "git notes"

1  2 
Documentation/git-cherry-pick.txt

Simple merge