Skip to content

Commit

Permalink
Update git-subtree doc to install in /opt
Browse files Browse the repository at this point in the history
  • Loading branch information
antoyo committed Aug 3, 2024
1 parent 98ed962 commit ee3664c
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions doc/subtree.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ Use the following instructions to install it:
git clone [email protected]:tqc/git.git
cd git
git checkout tqc/subtree
make
make install
make prefix=/opt/git
sudo make install prefix=/opt/git
cd contrib/subtree
make
cp git-subtree ~/bin
sudo cp git-subtree /opt/git/bin/
```

### Syncing with rust compiler

Do a sync with this command:

```bash
PATH="$HOME/bin:$PATH" ~/bin/git-subtree push -P compiler/rustc_codegen_gcc/ ../rustc_codegen_gcc/ sync_branch_name
PATH="/opt/git/bin:$PATH" git-subtree push -P compiler/rustc_codegen_gcc/ ../rustc_codegen_gcc/ sync_branch_name
cd ../rustc_codegen_gcc
git checkout master
git pull
Expand All @@ -40,11 +40,11 @@ To send the changes to the rust repo:
cd ../rust
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
PATH="/opt/git/bin:$PATH" 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
PATH="/opt/git/bin:$PATH" git-subtree push -P compiler/rustc_codegen_gcc/ ../rustc_codegen_gcc/ sync_branch_name
```

TODO: write a script that does the above.
Expand Down

0 comments on commit ee3664c

Please sign in to comment.