File tree Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -202,13 +202,19 @@ They are just regular files and directories. This is in contrast to `submodule`
202202
203203There are two synchronization directions: ` subtree push ` and ` subtree pull ` .
204204
205- ` git subtree push -P src/tools/clippy https://github.com/rust-lang/rust-clippy.git `
205+ ```
206+ git subtree push -P src/tools/clippy https://github.com/rust-lang/rust-clippy.git
207+ ```
206208
207209takes all the changes that
208210happened to the copy in this repo and creates commits on the remote repo that match the local
209211changes (so every local commit that touched the subtree causes a commit on the remote repo).
210212
211- ` git subtree pull -P src/tools/clippy https://github.com/rust-lang/rust-clippy.git `
213+ ```
214+ git subtree pull -P src/tools/clippy https://github.com/rust-lang/rust-clippy.git
215+ ```
216+
217+
212218takes all changes since the last ` subtree pull ` from the clippy
213219repo and adds these commits to the rustc repo + a merge commit with the existing changes.
214220It is recommended that you always do a push before a pull, so that the merge works without conflicts.
You can’t perform that action at this time.
0 commit comments