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

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

Junio C Hamano committed May 16, 2011 at 16:38 UTC 0f51322a6be0d31f299df7becad438e8edfb608b

No changes.