Merge branch 'cn/cherry-pick-range-docs' into maint

The documentation for "git cherry-pick A B..C" was misleading.

* cn/cherry-pick-range-docs:
  git-cherry-pick.txt: clarify the use of revision range notation
  Documentation: --no-walk is no-op if range is specified

diff --cc Documentation/git-cherry-pick.txt
index 9f3dae631e5437662e9fb3583b24f414c93bb140,49ac61c3d02c2a1dd5111550f70f87cbd311c8f8..0e170a51cac1de3f20b31f8dba7f832c292b815c
--- 1/Documentation/git-cherry-pick.txt
--- 2/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@@ -149,7 -132,16 +151,16 @@@ EXAMPLE
        Apply the changes introduced by all commits that are ancestors
        of master but not of HEAD to produce new commits.
  
 -`git cherry-pick master{tilde}4 master{tilde}2`::
+ `git cherry-pick maint next ^master`::
+ `git cherry-pick maint master..next`::
+ 
+       Apply the changes introduced by all commits that are
+       ancestors of maint or next, but not master or any of its
+       ancestors.  Note that the latter does not mean `maint` and
+       everything between `master` and `next`; specifically,
+       `maint` will not be used if it is included in `master`.
+ 
 +`git cherry-pick master~4 master~2`::
  
        Apply the changes introduced by the fifth and third last
        commits pointed to by master and create 2 new commits with

diff --cc Documentation/rev-list-options.txt
Simple merge