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"