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

6
pages/common/git-rebase.md
View File

@@ -4,9 +4,9 @@
> Commonly used to "move" an entire branch to another base, creating copies of the commits in the new location.
> More information: <https://git-scm.com/docs/git-rebase>.
- Rebase the current branch on top of the main branch:
- Rebase the current branch on top of the master branch:
`git rebase {{main}}`
`git rebase {{master}}`
- Start an interactive rebase, which allows the commits to be reordered, omitted, combined or modified:
@@ -34,4 +34,4 @@
- Auto-resolve any conflicts by favoring the working branch version (`theirs` keyword has reversed meaning in this case):
`git rebase -X theirs {{main}}`
`git rebase -X theirs {{master}}`

8
pages/common/git-request-pull.md
View File

@@ -3,10 +3,10 @@
> Generate a request asking the upstream project to pull changes into its tree.
> More information: <https://git-scm.com/docs/git-request-pull>.
- Produce a request summarizing the changes between the v1.1 release and main:
- Produce a request summarizing the changes between the v1.1 release and master:
`git request-pull {{v1.1}} {{https://example.com/project}} {{main}}`
`git request-pull {{v1.1}} {{https://example.com/project}} {{master}}`
- Produce a request summarizing the changes between the v0.1 release on main branch and local foo branch:
- Produce a request summarizing the changes between the v0.1 release on master branch and local foo branch:
`git request-pull {{v0.1}} {{https://example.com/project}} {{main:foo}}`
`git request-pull {{v0.1}} {{https://example.com/project}} {{master:foo}}`

2
pages/common/git-rev-list.md
View File

@@ -9,7 +9,7 @@
- List commits more recent than a specific date, on a specific branch:
`git rev-list --since={{'2019-12-01 00:00:00'}} {{main}}`
`git rev-list --since={{'2019-12-01 00:00:00'}} {{master}}`
- List all merge commits on a specific commit:

2
pages/common/git-revert.md
View File

@@ -13,7 +13,7 @@
- Revert multiple commits:
`git revert {{main~5..main~2}}`
`git revert {{master~5..master~2}}`
- Don't create new commits, just change the working tree:

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: