diff options
| author | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2020-04-01 17:45:47 +0200 |
|---|---|---|
| committer | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2020-04-01 17:45:47 +0200 |
| commit | 59cfb8035c387bcf7297c08b78dd099dec2dd7f4 (patch) | |
| tree | 9aa37f19d122b9d93e04cc5c03a5034b4feaa2a0 /CONTRIBUTING.md | |
| parent | af553528ade187a0f85bb3fa9ffb22420c630238 (diff) | |
| download | rust-59cfb8035c387bcf7297c08b78dd099dec2dd7f4.tar.gz rust-59cfb8035c387bcf7297c08b78dd099dec2dd7f4.zip | |
Triple backticks
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 156ebdb0795..486129ac4fa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -202,13 +202,19 @@ They are just regular files and directories. This is in contrast to `submodule` There are two synchronization directions: `subtree push` and `subtree pull`. -`git subtree push -P src/tools/clippy https://github.com/rust-lang/rust-clippy.git` +``` +git subtree push -P src/tools/clippy https://github.com/rust-lang/rust-clippy.git +``` takes all the changes that happened to the copy in this repo and creates commits on the remote repo that match the local changes (so every local commit that touched the subtree causes a commit on the remote repo). -`git subtree pull -P src/tools/clippy https://github.com/rust-lang/rust-clippy.git` +``` +git subtree pull -P src/tools/clippy https://github.com/rust-lang/rust-clippy.git +``` + + takes all changes since the last `subtree pull` from the clippy repo and adds these commits to the rustc repo + a merge commit with the existing changes. It is recommended that you always do a push before a pull, so that the merge works without conflicts. |