summaryrefslogtreecommitdiff
path: root/t/t6060-merge-index.sh
diff options
context:
space:
mode:
authorLibravatar Carlos Martín Nieto <cmn@elego.de>2012-06-15 16:33:16 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-15 10:56:13 -0700
commitb98878edefd284927748aa2ce9ff090fa43c2c8a (patch)
tree9c49e4b9c6878e82ff0d7a28ed17792f0d89dc32 /t/t6060-merge-index.sh
parentDocumentation: --no-walk is no-op if range is specified (diff)
downloadtgif-b98878edefd284927748aa2ce9ff090fa43c2c8a.tar.xz
git-cherry-pick.txt: clarify the use of revision range notation
When given a set of commits, cherry-pick will apply the changes for all of them. Specifying a simple range will also work as expected. This can lead the user to think that git cherry-pick A B..C may apply A and then B..C, but that is not what happens. Instead the revs are given to a single invocation of rev-list, which will consider A and C as positive revs and B as a negative one. The commit A will not be used if it is an ancestor of B. Add a note about this and add an example with this particular syntax, which has shown up on the list a few times. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6060-merge-index.sh')
0 files changed, 0 insertions, 0 deletions