From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Jul 2012 19:45:34 +0000 (-0700)
Subject: Merge branch 'cn/cherry-pick-range-docs' into maint
X-Git-Tag: v1.7.11.2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0ceb72f38bf841322fc8ce28ea39328e8a5aa19;p=thirdparty%2Fgit.git

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

a0ceb72f38bf841322fc8ce28ea39328e8a5aa19
diff --cc Documentation/git-cherry-pick.txt
index 9f3dae631e,49ac61c3d0..0e170a51ca
--- 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