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)
commit0f51322a6be0d31f299df7becad438e8edfb608b
treeba670d0bc41048cf6f8b70b50fc130dd7e438c52
parent8de43386505b503e25788f75f89802495828e6c0
parentbea7d16e8b8248602ea033b188f862699af4b977
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"
Documentation/git-cherry-pick.txt