diff docs/evolve-faq.rst @ 778:35c8c5e8e3d3 stable

doc: replace graft -O with grab

--- a/docs/evolve-faq.rst	Wed Jan 22 14:10:24 2014 -0800
+++ b/docs/evolve-faq.rst	Wed Jan 22 14:12:07 2014 -0800
@@ -35,29 +35,15 @@
 
 
 
-Move a changeset: ``graft``
+Move a changeset: ``grab``
 ------------------------------------------------------------
 
-The graft command introduced in 2.0 allows you to "copy changes from other
-branches onto the current branch".
-
-The graft command has been altered to allow the creation of an
-obsolete marker indicating both the result cset and its source
-(actually recording changeset movements).
-
-This is achieved using a new flag `-O` (or `old-obsolete`) [#]_.
-
+You can use ``hg grab <rev>`` to move a rev at your current location, making the
+old version obsolete.
 
-XXX example
-
-.. warning:: when using graft --continue after conflict resolution you **MUST**
-             pass `-O` or `-o` flag again because they are not saved for now
+.. note:: grab is an alias for ``hg rebase --dest . --rev $@; hg up <result>``
 
 
-.. [#] add this `-O` to graft instead of a dedicated command is probably
-       abusive. But this was very convenient for experimental purposes.
-       This will likely change in non experimental release.
-
 Delete a changeset: ``prune``
 ------------------------------------------------------------