mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Git subtree is upstream, no need to install

Browse source
This commit is contained in:
Oliver Scherer 2020-04-01 16:18:25 +02:00
parent 56d0c81c75
commit 521eb0df67
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CONTRIBUTING.md
View file

@ -198,9 +198,6 @@ differently from other crates that are directly in this repo:
They are just regular files and directories. This is in contrast to `submodule` dependencies They are just regular files and directories. This is in contrast to `submodule` dependencies
(see below for those). (see below for those).
If you want to synchronize or otherwise work with subtrees, install the `git subtree` command via
instructions found at https://github.com/ingydotnet/git-subtree
#### Synchronizing a subtree #### Synchronizing a subtree
There are two synchronization directions: `subtree push` and `subtree pull`. There are two synchronization directions: `subtree push` and `subtree pull`.
@ -230,8 +227,7 @@ This will create a new commit, which you may not rebase under any circumstances!
and redo the operation if you need to rebase. and redo the operation if you need to rebase.
Now you're done, the `src/tools/clippy` directory behaves as if clippy were part of the rustc Now you're done, the `src/tools/clippy` directory behaves as if clippy were part of the rustc
monorepo, so no one but you (or others that synchronize subtrees) needs to have `git subtree` monorepo, so no one but you (or others that synchronize subtrees) needs actually use `git subtree`.
installed.
### External Dependencies (submodules) ### External Dependencies (submodules)