Code

Merge branch 'ss/cherry-pick-x-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:38:56 +0000 (16:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:38:56 +0000 (16:38 -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