DawnMagnet/tldr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(chore) replace master/slave with inclusive language (#4459)

Browse Source
This commit is contained in:
Quinn Vissak
2020-10-06 10:24:10 -04:00
committed by GitHub
parent 249b40598c
commit 4497535246
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pages/common/git-subtree.md
View File

@@ -5,19 +5,19 @@
- Add a git repository as a subtree:
`git subtree add --prefix={{path/to/directory/}} --squash {{repository_url}} {{master}}`
`git subtree add --prefix={{path/to/directory/}} --squash {{repository_url}} {{main}}`
- Update subtree repository to its latest commit:
`git subtree pull --prefix={{path/to/directory/}} {{repository_url}} {{master}}`
`git subtree pull --prefix={{path/to/directory/}} {{repository_url}} {{main}}`
- Merge a subtree repository into master:
- Merge a subtree repository into main:
`git subtree merge --prefix={{path/to/directory/}} --squash {{repository_url}} {{master}}`
`git subtree merge --prefix={{path/to/directory/}} --squash {{repository_url}} {{main}}`
- Push commits to a subtree repository:
`git subtree push --prefix={{path/to/directory/}} {{repository_url}} {{master}}`
`git subtree push --prefix={{path/to/directory/}} {{repository_url}} {{main}}`
- Extract a new project history from the history of a subtree: