Skip to content

Commit

Permalink
Merge pull request #3 from Kobzol/foo
Browse files Browse the repository at this point in the history
Foo
  • Loading branch information
Kobzol authored Jan 5, 2025
2 parents 918e1d1 + 9526539 commit fedc70d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# The Rust Code of Conduct

This repository follows the [Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct) of the Rust organization.
FOO
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ This repository is linked to `rust-lang/rust` as a [josh](https://josh-project.g
$ cargo run --manifest-path josh-sync/Cargo.toml rustc-pull
```
3) Push the branch to your fork and create a PR into `rustc-dev-guide`
FOO
### Push changes from this repository into `rust-lang/rust`
1) Run the push command to create a branch named `<branch-name>` in a `rustc` fork under the `<gh-username>` account
```
Expand Down
2 changes: 1 addition & 1 deletion josh-sync/src/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use xshell::{cmd, Shell};
/// Used for rustc syncs.
const JOSH_FILTER: &str = ":/src/doc/rustc-dev-guide";
const JOSH_PORT: u16 = 42042;
const UPSTREAM_REPO: &str = "rust-lang/rust";
const UPSTREAM_REPO: &str = "kobzol/rust";

pub struct GitSync {
dir: PathBuf,
Expand Down
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dcfa38fe234de9304169afc6638e81d0dd222c06
33b0597e9b8357669153ddf341db5ba773e7de73

0 comments on commit fedc70d

Please sign in to comment.