diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-11-16 21:15:07 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-11-16 21:15:07 +0000 |
| commit | 4db95ce3cb9f98afb2624bc318883213dfe064e6 (patch) | |
| tree | 38d2663a0b45ad0caec0ba87cafd2f495f59039d /compiler/rustc_codegen_cranelift/scripts/rustup.sh | |
| parent | 820f06b21f8373060ff7b515715b8440a6a6c197 (diff) | |
| parent | def04540a4e2541b995195c752c751295606a388 (diff) | |
| download | rust-4db95ce3cb9f98afb2624bc318883213dfe064e6.tar.gz rust-4db95ce3cb9f98afb2624bc318883213dfe064e6.zip | |
Merge commit 'def04540a4e2541b995195c752c751295606a388' into sync_cg_clif-2023-11-16
Diffstat (limited to 'compiler/rustc_codegen_cranelift/scripts/rustup.sh')
| -rwxr-xr-x | compiler/rustc_codegen_cranelift/scripts/rustup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_cranelift/scripts/rustup.sh b/compiler/rustc_codegen_cranelift/scripts/rustup.sh index e62788f2e50..355282911c2 100755 --- a/compiler/rustc_codegen_cranelift/scripts/rustup.sh +++ b/compiler/rustc_codegen_cranelift/scripts/rustup.sh @@ -46,7 +46,7 @@ case $1 in git pull origin master branch=sync_cg_clif-$(date +%Y-%m-%d) git checkout -b "$branch" - "$cg_clif/git-fixed-subtree.sh" pull --prefix=compiler/rustc_codegen_cranelift/ https://github.com/bjorn3/rustc_codegen_cranelift.git master + "$cg_clif/git-fixed-subtree.sh" pull --prefix=compiler/rustc_codegen_cranelift/ https://github.com/rust-lang/rustc_codegen_cranelift.git master git push -u my "$branch" # immediately merge the merge commit into cg_clif to prevent merge conflicts when syncing |