Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11

[git.git] / Documentation / git-cherry-pick.txt

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 9f3dae631e5437662e9fb3583b24f414c93bb140..0e170a51cac1de3f20b31f8dba7f832c292b815c 100644 (file)
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -47,7 +47,9 @@ OPTIONS
        linkgit:gitrevisions[7].
        Sets of commits can be passed but no traversal is done by
        default, as if the '--no-walk' option was specified, see
        linkgit:gitrevisions[7].
        Sets of commits can be passed but no traversal is done by
        default, as if the '--no-walk' option was specified, see

-       linkgit:git-rev-list[1].
+       linkgit:git-rev-list[1]. Note that specifying a range will
+       feed all <commit>... arguments to a single revision walk
+       (see a later example that uses 'maint master..next').

 
 -e::
 --edit::
 
 -e::
 --edit::


@@ -149,6 +151,15 @@ EXAMPLES
        Apply the changes introduced by all commits that are ancestors
        of master but not of HEAD to produce new commits.
 
        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~4 master~2`::
 
        Apply the changes introduced by the fifth and third last
 `git cherry-pick master~4 master~2`::
 
        Apply the changes introduced by the fifth and third last