File tree 1 file changed +8
-2
lines changed
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`
202
202
203
203
There are two synchronization directions: ` subtree push ` and ` subtree pull ` .
204
204
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
+ ```
206
208
207
209
takes all the changes that
208
210
happened to the copy in this repo and creates commits on the remote repo that match the local
209
211
changes (so every local commit that touched the subtree causes a commit on the remote repo).
210
212
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
+
212
218
takes all changes since the last ` subtree pull ` from the clippy
213
219
repo and adds these commits to the rustc repo + a merge commit with the existing changes.
214
220
It 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