Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

linked issue is closed #1729

Merged
merged 2 commits into from
Jul 12, 2023
Merged

linked issue is closed #1729

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe60fe5
linked issue is closed
tshepang Jul 9, 2023
dd3ac3c
remove some strays
tshepang Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions src/git.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,24 +246,6 @@ Some submodules are not actually needed; for example, `src/llvm-project` doesn't
out if you're using `download-ci-llvm`. To avoid having to keep fetching its history, you can use
`git submodule deinit -f src/llvm-project`, which will also avoid it showing as modified again.

Note that, as of <!-- date-check --> Aug 2022,
there is a [bug][#77620] if you use worktrees,
submodules, and `x` in a commit hook.
If you run into an error like the following,
it's not anything you did wrong:

```
error: failed to read `/home/jyn/rustc-worktree/src/tools/cargo/Cargo.toml`

Caused by:
No such file or directory (os error 2)
```

There is a workaround in [the issue][#77620-workaround].

[#77620]: https://github.com/rust-lang/rust/issues/77620
[#77620-workaround]: https://github.com/rust-lang/rust/issues/77620#issuecomment-705228229

## Rebasing and Conflicts

When you edit your code locally, you are making changes to the version of
Expand Down