From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jun 2012 18:25:38 +0000 (-0700)
Subject: Merge branch 'cn/cherry-pick-range-docs'
X-Git-Tag: v1.7.12-rc0~80
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a913b56fcbc86259f5422043e2f603e8738b158b;p=git.git

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

The command line argument of "git cherry-pick maint master..next" is
just an ordinary revision range, which is unintuitive and at least
deserves documentation.

* 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
---

a913b56fcbc86259f5422043e2f603e8738b158b
diff --cc Documentation/git-cherry-pick.txt
index 9f3dae631,49ac61c3d..0e170a51c
--- a/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 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{tilde}4 master{tilde}2`::
 +`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