git-*: use inclusive language (#4533)
* 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:

committed by
GitHub

parent
2daea2c8ac
commit
948bcac65d
@@ -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 master branch:
|
||||
- Rebase the current branch on top of another specified branch:
|
||||
|
||||
`git rebase {{master}}`
|
||||
`git rebase {{new_base_branch}}`
|
||||
|
||||
- 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 {{master}}`
|
||||
`git rebase -X theirs {{branch_name}}`
|
||||
|
Reference in New Issue
Block a user