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

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

Browse Source 
This reverts commit 4497535246.
This commit is contained in:
Starbeamrainbowlabs
2020-10-06 17:48:57 +01:00
committed by GitHub
parent 50f42a99eb
commit be3998d964
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}} {{main}}`
`git subtree add --prefix={{path/to/directory/}} --squash {{repository_url}} {{master}}`
- Update subtree repository to its latest commit:
`git subtree pull --prefix={{path/to/directory/}} {{repository_url}} {{main}}`
`git subtree pull --prefix={{path/to/directory/}} {{repository_url}} {{master}}`
- Merge a subtree repository into main:
- Merge a subtree repository into master:
`git subtree merge --prefix={{path/to/directory/}} --squash {{repository_url}} {{main}}`
`git subtree merge --prefix={{path/to/directory/}} --squash {{repository_url}} {{master}}`
- Push commits to a subtree repository:
`git subtree push --prefix={{path/to/directory/}} {{repository_url}} {{main}}`
`git subtree push --prefix={{path/to/directory/}} {{repository_url}} {{master}}`
- Extract a new project history from the history of a subtree: