Skip to content

Commit c0b9ad1

Browse files
committed
Auto merge of #141066 - matthiaskrgr:rollup-e7tyrj5, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #140791 (std: explain prefer `TryInto` over `TryFrom` when specifying traits bounds on generic function) - #140834 (move (or remove) some impl Trait tests) - #140910 (Remove `stable` attribute from wasi fs (read_exact|write_all)_at) - #140984 (fix doc for UnixStream) - #140997 (Add negative test coverage for `-Clink-self-contained` and `-Zlinker-features`) - #141003 (Improve ternary operator recovery) - #141009 (Migrate to modern datetime API) - #141013 (Implement methods to set STARTUPINFO flags for Command API on Windows) - #141026 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7ae5d34 + 48e2034 commit c0b9ad1

File tree

16 files changed

+201
-172
lines changed

16 files changed

+201
-172
lines changed

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,16 @@ Older versions of `josh-proxy` may not round trip commits losslessly so it is im
9191
3) Push the branch to your fork and create a PR into `rustc-dev-guide`
9292
9393
### Push changes from this repository into `rust-lang/rust`
94+
95+
NOTE: If you use Git protocol to push to your fork of `rust-lang/rust`,
96+
ensure that you have this entry in your Git config,
97+
else the 2 steps that follow would prompt for a username and password:
98+
99+
```
100+
[url "git@github.com:"]
101+
insteadOf = "https://github.com/"
102+
```
103+
94104
1) Run the push command to create a branch named `<branch-name>` in a `rustc` fork under the `<gh-username>` account
95105
```
96106
cargo run --manifest-path josh-sync/Cargo.toml rustc-push <branch-name> <gh-username>

0 commit comments

Comments
 (0)