diff options
| author | Antoni Boucher <bouanto@zoho.com> | 2023-11-22 07:40:14 -0500 |
|---|---|---|
| committer | Antoni Boucher <bouanto@zoho.com> | 2023-11-22 07:40:14 -0500 |
| commit | a412e9c411ff13aaea0c88aeee0ad55690f2e2ce (patch) | |
| tree | d0e71480d2c8c73b9388da9c6dcf57181b34290f | |
| parent | 456754c21a4a9e8889ac4c4ca645b5861febe1b8 (diff) | |
| download | rust-a412e9c411ff13aaea0c88aeee0ad55690f2e2ce.tar.gz rust-a412e9c411ff13aaea0c88aeee0ad55690f2e2ce.zip | |
Update README
| -rw-r--r-- | Readme.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Readme.md b/Readme.md index 95fc6374c09..20871ceb814 100644 --- a/Readme.md +++ b/Readme.md @@ -295,6 +295,9 @@ git pull origin master git checkout -b subtree-update_cg_gcc_YYYY-MM-DD PATH="$HOME/bin:$PATH" ~/bin/git-subtree pull --prefix=compiler/rustc_codegen_gcc/ https://github.com/rust-lang/rustc_codegen_gcc.git master git push + +# Immediately merge the merge commit into cg_gcc to prevent merge conflicts when syncing from rust-lang/rust later. +PATH="$HOME/bin:$PATH" ~/bin/git-subtree push -P compiler/rustc_codegen_gcc/ ../rustc_codegen_gcc/ sync_branch_name ``` TODO: write a script that does the above. |