# HG changeset patch
# User David Douard <david.douard@logilab.fr>
# Date 1333381226 -7200
# Node ID 4df233db5d42d28c01ba4d4933af9b9915043a11
# Parent  4bb038229f2647519721ce378abd1fadf3797416
FAQ: add en entry about rebasing after a pull

diff -r 4bb038229f26 -r 4df233db5d42 docs/evolve-faq.rst
--- 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``
 ------------------------------------------------------------