Skip to content

Commit

Permalink
Git subtree is upstream, no need to install
Browse files Browse the repository at this point in the history
  • Loading branch information
oli-obk committed Apr 1, 2020
1 parent 56d0c81 commit 521eb0d
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
(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

There are two synchronization directions: `subtree push` and `subtree pull`.
Expand Down Expand Up @@ -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.

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`
installed.
monorepo, so no one but you (or others that synchronize subtrees) needs actually use `git subtree`.


### External Dependencies (submodules)
Expand Down

0 comments on commit 521eb0d

Please sign in to comment.