comparison hgext/transplant.py @ 13606:1532ed1e50ca stable

transplant: avoid the word "rebase" when we mean "transplant"
author Martin Geisler <mg@lazybytes.net>
date Sun, 13 Mar 2011 12:44:35 +0100
parents 888ec2650c2d
children 2151703e7f84 b00ab6890fe9
comparison
equal deleted inserted replaced
13605:888ec2650c2d 13606:1532ed1e50ca
471 the branch holding the named revision, up to that revision. If 471 the branch holding the named revision, up to that revision. If
472 --all/-a is specified, all changesets on the branch will be 472 --all/-a is specified, all changesets on the branch will be
473 transplanted, otherwise you will be prompted to select the 473 transplanted, otherwise you will be prompted to select the
474 changesets you want. 474 changesets you want.
475 475
476 :hg:`transplant --branch REVISION --all` will rebase the selected 476 :hg:`transplant --branch REVISION --all` will transplant the
477 branch (up to the named revision) onto your current working 477 selected branch (up to the named revision) onto your current
478 directory. 478 working directory.
479 479
480 You can optionally mark selected transplanted changesets as merge 480 You can optionally mark selected transplanted changesets as merge
481 changesets. You will not be prompted to transplant any ancestors 481 changesets. You will not be prompted to transplant any ancestors
482 of a merged transplant, and you can merge descendants of them 482 of a merged transplant, and you can merge descendants of them
483 normally instead of transplanting them. 483 normally instead of transplanting them.