--- a/docs/evolve-faq.rst Sun Jul 08 19:02:36 2012 +0200
+++ b/docs/evolve-faq.rst Sun Jul 08 19:18:07 2012 +0200
@@ -96,9 +96,9 @@
Getting changes out of a commit
------------------------------------------------------------
-the ``hg uncommit`` commands allow you to rewrite the current commit to not
-include change for some file. The content of target files are not altered on
-disk and back as "modified"::
+The ``hg uncommit`` command lets you rewrite the parent commit without
+selected changed files. Target files content is not altered and
+appears again as "modified"::
$ hg st
M babar
@@ -112,11 +112,10 @@
Split a changeset
-----------------------
-I you just want to split whole file, you can just use the ``uncommit`` command.
-
+To split on file boundaries, just use ``uncommit`` command.
-If you need fine grained split, there is no official command for that yet.
-However is it easily achieved by manual operation::
+There is no official command yet to split at a finer granularity. One
+way to achieve this is::
### you want to split changeset A: 42
# update to A parent
@@ -188,7 +187,7 @@
Export to mq: ``synchronize``
------------------------------------------------------------
-Another extension allows to export. you changes to mq
+Another extension lets you export your changes to mq.
View diff from the last amend
------------------------------------------------------------
@@ -223,8 +222,8 @@
Extinct changesets are hidden using the *hidden* feature of mercurial.
-Only ``hg log`` and ``hgview`` support it. ``hg glog`` Only support that since
-2.2. Other visual viewer don't.
+Only ``hg log``, ``hg glog`` and ``hgview`` support it, other
+graphical viewer do not.