diff options
| author | Joshua Nelson <github@jyn.dev> | 2022-12-31 17:51:12 -0600 |
|---|---|---|
| committer | Joshua Nelson <github@jyn.dev> | 2022-12-31 23:20:47 -0600 |
| commit | ee2c4f3e2779ff91177acef17fc6ad31463fe230 (patch) | |
| tree | 9c3c7890f1067c499d17edc13100b31ed230347d /src/doc/rustc-dev-guide | |
| parent | 97641d5eef9c04ed85f14f93c8a8251fb6848098 (diff) | |
| download | rust-ee2c4f3e2779ff91177acef17fc6ad31463fe230.tar.gz rust-ee2c4f3e2779ff91177acef17fc6ad31463fe230.zip | |
fix typo
Co-authored-by: Noah Lev <camelidcamel@gmail.com>
Diffstat (limited to 'src/doc/rustc-dev-guide')
| -rw-r--r-- | src/doc/rustc-dev-guide/src/git.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/rustc-dev-guide/src/git.md b/src/doc/rustc-dev-guide/src/git.md index d79c07ed0fd..dfcf49656ff 100644 --- a/src/doc/rustc-dev-guide/src/git.md +++ b/src/doc/rustc-dev-guide/src/git.md @@ -140,7 +140,7 @@ You might also notice conflicts in the web UI: The most common cause is that you rebased after a change and ran `git add .` without first running `x.py` to update the submodules. Alternatively, you might have run `cargo fmt` instead of `x fmt` -and modified files in a submodule, then commited the changes. +and modified files in a submodule, then committed the changes. To fix it, do the following things: |