diff options
| author | Paco Esteban <paco@onna.be> | 2019-08-25 12:00:19 +0200 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-08-26 10:03:16 +0900 |
| commit | acf292e2c0bd52a0c909d3d146e5f41daa394f46 (patch) | |
| tree | 77b1b2467b2274c87d8ee1ce259e6990b8924803 | |
| parent | 70c57b22f945a1bef893ce2f70d3b589286a5260 (diff) | |
| download | sr.ht-docs-acf292e2c0bd52a0c909d3d146e5f41daa394f46.tar.gz | |
mention rebase extension on email docs.
| -rw-r--r-- | hg.sr.ht/email.md | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/hg.sr.ht/email.md b/hg.sr.ht/email.md index 40e1d93..b08a55e 100644 --- a/hg.sr.ht/email.md +++ b/hg.sr.ht/email.md @@ -128,9 +128,10 @@ so you can optionally disable this feature in your config (you can always pass 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 @@ email` normally, except: 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 |