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
This commit is contained in:
Junio C Hamano 2012-07-11 12:45:34 -07:00
commit a0ceb72f38
2 changed files with 13 additions and 1 deletions

View file

@ -47,7 +47,9 @@ OPTIONS
linkgit:gitrevisions[7]. linkgit:gitrevisions[7].
Sets of commits can be passed but no traversal is done by Sets of commits can be passed but no traversal is done by
default, as if the '--no-walk' option was specified, see 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:: -e::
--edit:: --edit::
@ -149,6 +151,15 @@ EXAMPLES
Apply the changes introduced by all commits that are ancestors Apply the changes introduced by all commits that are ancestors
of master but not of HEAD to produce new commits. 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`:: `git cherry-pick master~4 master~2`::
Apply the changes introduced by the fifth and third last Apply the changes introduced by the fifth and third last

View file

@ -622,6 +622,7 @@ These options are mostly targeted for packing of git repositories.
--no-walk:: --no-walk::
Only show the given revs, but do not traverse their ancestors. Only show the given revs, but do not traverse their ancestors.
This has no effect if a range is specified.
--do-walk:: --do-walk::