Pierre-Yves David avatar Pierre-Yves David committed 40292a3

doc: update how-to

Comments (0)

Files changed (1)

docs/evolve-faq.rst

   # current changeset (.) and previous one (.^) replace A (42)
   $ hg prune --new . --new .^ 42
 
+For more complexe scenario we recommand the use of the histedit_ extension.
 
-Update my current work in progess after a pull
+.. _histedit:: http://mercurial.selenic.com/wiki/HisteditExtension
+
+
+Update my current work in progress after a pull
 ----------------------------------------------
 
-Whenever you are working on some changesets, it is more likely that 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 
+And it is likely that you will want your work in progress changiesets to be
 rebased on the top of this newly imported subtree.
 
 Doing so is only a matter of rebasing.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.