@@ 128,9 128,10 @@ You will likely receive replies to your email with feedback on your changes.
This is normal! Use tools like [`hg commit --amend`][hg-commit] and [`hg
- rebase`][hg-rebase] to continue improving your patch set and iterating on
- feedback. When you're ready to submit the next version of your patches, use `hg
- email` normally, except:
+ rebase`][hg-rebase] (which, again, isn't accessible by default but is available
+ in the `rebase` extension which ships with Mercurial) to continue improving
+ your patch set and iterating on feedback. When you're ready to submit the next
+ version of your patches, use `hg email` normally, except:
- Add `--flag V2` to indicate that this is version 2 of your patch (or whatever
number is appropriate).
@@ 147,7 148,8 @@ As you continue to work, you may want to pull from the upstream, and you almost
certainly don't want to create a merge commit when you have work in progress or
unmerged changes in your history. To this end, you should generally use `hg pull
- --rebase` to fetch the latest changes from upstream.
+ --rebase` (this option is only available once the `rebase` extension is
+ installed) to fetch the latest changes from upstream.
## Extra tips