diff options
| author | Gus Wynn <guswynn@gmail.com> | 2021-06-09 08:23:36 -0700 |
|---|---|---|
| committer | Joshua Nelson <jyn514@gmail.com> | 2021-06-09 14:43:20 -0400 |
| commit | fcf32f4aa92e2c5afc78dd4c0b97aba476339c3e (patch) | |
| tree | f2aef1bd5141151909279f257dfe9d27f4fa7959 /src/doc | |
| parent | 00a8451b3c1f8e2921ec6064e83648c5bbcaaa5e (diff) | |
| download | rust-fcf32f4aa92e2c5afc78dd4c0b97aba476339c3e.tar.gz rust-fcf32f4aa92e2c5afc78dd4c0b97aba476339c3e.zip | |
move 7/8 to prose
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/rustc-dev-guide/src/git.md | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/doc/rustc-dev-guide/src/git.md b/src/doc/rustc-dev-guide/src/git.md index fb64b3bcab4..361b65a81a3 100644 --- a/src/doc/rustc-dev-guide/src/git.md +++ b/src/doc/rustc-dev-guide/src/git.md @@ -70,13 +70,14 @@ and PRs: 6. Push your changes to your fork: `git push --set-upstream origin issue-12345-fix` (After adding commits, you can use `git push` and after rebasing or pulling-and-rebasing, you can use `git push --force-with-lease`). - 7. If you end up needing to rebase and are hitting conflicts, see [Rebasing](#rebasing). - 8. If you want to track upstream while working on long-running feature/issue, see - [Keeping things up to date](#keeping-things-up-to-date). - 9. [Open a PR][ghpullrequest] from your fork to `rust-lang/rust`'s master branch. + 7. [Open a PR][ghpullrequest] from your fork to `rust-lang/rust`'s master branch. [ghpullrequest]: https://guides.github.com/activities/forking/#making-a-pull-request +If you end up needing to rebase and are hitting conflicts, see [Rebasing](#rebasing). +If you want to track upstream while working on long-running feature/issue, see +[Keeping things up to date](#keeping-things-up-to-date). + If your reviewer requests changes, the procedure for those changes looks much the same, with some steps skipped: |