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

git-*: use inclusive language (#4533)

Browse Source 
* git subtree: make language inclusive

* git revert: make language inclusive

* git rev-list: make language inclusive

* git request-pull: make language inclusive

* git rebase: make language inclusive

* git revert/es: make language inclusive

* git rev-list/es: make language inclusive

* git rebase/es: make language inclusive

* git-rebase/es: improve language

Co-authored-by: Marco Bonelli <marco@mebeim.net>

* git-rebase/es: improve language

Co-authored-by: Axel Navarro <navarroaxel@gmail.com>

* Update git-rebase.md

* git-subtree: revise example description

* git-rebase/es: translate branch_name

Co-authored-by: Axel Navarro <navarroaxel@gmail.com>

* Update git-rebase.md

* Update git-rev-list.md

* Update pages.es/common/git-revert.md

Co-authored-by: Axel Navarro <navarroaxel@gmail.com>

* Apply suggestions from code review

Co-authored-by: Waldir Pimenta <waldyrious@gmail.com>

Co-authored-by: Marco Bonelli <marco@mebeim.net>
Co-authored-by: Axel Navarro <navarroaxel@gmail.com>
Co-authored-by: Waldir Pimenta <waldyrious@gmail.com>
This commit is contained in:
Starbeamrainbowlabs
2020-10-19 19:26:01 +01:00
committed by GitHub
parent 2daea2c8ac
commit 948bcac65d
8 changed files with 20 additions and 20 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}} {{branch_name}}`
- 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}} {{branch_name}}`
- Merge a subtree repository into master:
- Merge recent changes up to the latest subtree commit into the subtree:
`git subtree merge --prefix={{path/to/directory/}} --squash {{repository_url}} {{master}}`
`git subtree merge --prefix={{path/to/directory/}} --squash {{repository_url}} {{branch_name}}`
- 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}} {{branch_name}}`
- Extract a new project history from the history of a subtree: