Mercurial > evolve
changeset 200:4df233db5d42
FAQ: add en entry about rebasing after a pull
| author | David Douard <david.douard@logilab.fr> |
|---|---|
| date | Mon, 02 Apr 2012 17:40:26 +0200 |
| parents | 4bb038229f26 |
| children | 94360b577857 |
| files | docs/evolve-faq.rst |
| diffstat | 1 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/evolve-faq.rst Mon Apr 02 17:40:48 2012 +0200 +++ b/docs/evolve-faq.rst Mon Apr 02 17:40:26 2012 +0200 @@ -113,6 +113,19 @@ $ hg kill --new . --new .^ 42 +Update my current work in progess after a pull +---------------------------------------------- + +Whenever you are working on some changesets, it is more likely that a pull +will, eventually, import new changesets in your tree. + +And it is likely that you will want your work in progress changsets to be +rebased on the top of this newly imported subtree. + +Doing so is only a matter of rebasing. + + + Move multiple changesets: ``rebase`` ------------------------------------------------------------