From 948bcac65d48179728f823176fb4f4f7d58c201d Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Mon, 19 Oct 2020 19:26:01 +0100 Subject: [PATCH] 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 * git-rebase/es: improve language Co-authored-by: Axel Navarro * Update git-rebase.md * git-subtree: revise example description * git-rebase/es: translate branch_name Co-authored-by: Axel Navarro * Update git-rebase.md * Update git-rev-list.md * Update pages.es/common/git-revert.md Co-authored-by: Axel Navarro * Apply suggestions from code review Co-authored-by: Waldir Pimenta Co-authored-by: Marco Bonelli Co-authored-by: Axel Navarro Co-authored-by: Waldir Pimenta --- pages.es/common/git-rebase.md | 6 +++--- pages.es/common/git-rev-list.md | 4 ++-- pages.es/common/git-revert.md | 2 +- pages/common/git-rebase.md | 6 +++--- pages/common/git-request-pull.md | 8 ++++---- pages/common/git-rev-list.md | 2 +- pages/common/git-revert.md | 2 +- pages/common/git-subtree.md | 10 +++++----- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pages.es/common/git-rebase.md b/pages.es/common/git-rebase.md index 207717fd4..2d910c752 100644 --- a/pages.es/common/git-rebase.md +++ b/pages.es/common/git-rebase.md @@ -4,9 +4,9 @@ > Se utiliza comúnmente para "mover" una rama entera a otra base, ya que crea copias de los commits en una nueva ubicación. > Más información: . -- Rebasa la rama actual en lo más alto de la rama master: +- Reorganiza la rama actual en lo más alto de otra rama: -`git rebase {{master}}` +`git rebase {{rama_de_reorganización}}` - Inicia un rebase interactivo que permite reordenar los commits, omitirlos, combinarlos o modificarlos: @@ -34,4 +34,4 @@ - Resuelve automáticamente cualquier conflicto favoreciendo la versión de la rama en la que se esta trabajando (en este caso la palabra `theirs` tiene un significado invertido): -`git rebase -X theirs {{master}}` +`git rebase -X theirs {{rama_de_reorganización}}` diff --git a/pages.es/common/git-rev-list.md b/pages.es/common/git-rev-list.md index a4b71b7db..db6c693b2 100644 --- a/pages.es/common/git-rev-list.md +++ b/pages.es/common/git-rev-list.md @@ -7,9 +7,9 @@ `git rev-list {{HEAD}}` -- Muestra los commits más reciente a partir de una fecha y una rama específica: +- Muestra los commits más recientes a partir de una fecha y una rama específica: -`git rev-list --since={{'2019-12-01 00:00:00'}} {{master}}` +`git rev-list --since={{'2019-12-01 00:00:00'}} {{nombre_de_rama}}` - Muestra todos los commits fusionados en un commit específico: diff --git a/pages.es/common/git-revert.md b/pages.es/common/git-revert.md index 8a56ebd49..bda26922d 100644 --- a/pages.es/common/git-revert.md +++ b/pages.es/common/git-revert.md @@ -13,7 +13,7 @@ - Revierte múltiples commits: -`git revert {{master~5..master~2}}` +`git revert {{rama~5..rama~2}}` - No crea nuevos commits, solo cambia el árbol de trabajo: diff --git a/pages/common/git-rebase.md b/pages/common/git-rebase.md index 384d26ba5..8b7d396c3 100644 --- a/pages/common/git-rebase.md +++ b/pages/common/git-rebase.md @@ -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: . -- 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}}` diff --git a/pages/common/git-request-pull.md b/pages/common/git-request-pull.md index 4d4a37773..5e781a71f 100644 --- a/pages/common/git-request-pull.md +++ b/pages/common/git-request-pull.md @@ -3,10 +3,10 @@ > Generate a request asking the upstream project to pull changes into its tree. > More information: . -- Produce a request summarizing the changes between the v1.1 release and master: +- Produce a request summarizing the changes between the v1.1 release and a specified branch: -`git request-pull {{v1.1}} {{https://example.com/project}} {{master}}` +`git request-pull {{v1.1}} {{https://example.com/project}} {{branch_name}}` -- Produce a request summarizing the changes between the v0.1 release on master branch and local foo branch: +- Produce a request summarizing the changes between the v0.1 release on the `foo` branch and the local `bar` branch: -`git request-pull {{v0.1}} {{https://example.com/project}} {{master:foo}}` +`git request-pull {{v0.1}} {{https://example.com/project}} {{foo:bar}}` diff --git a/pages/common/git-rev-list.md b/pages/common/git-rev-list.md index 2ffa1f7c2..fbb7a5926 100644 --- a/pages/common/git-rev-list.md +++ b/pages/common/git-rev-list.md @@ -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'}} {{master}}` +`git rev-list --since={{'2019-12-01 00:00:00'}} {{branch_name}}` - List all merge commits on a specific commit: diff --git a/pages/common/git-revert.md b/pages/common/git-revert.md index 78cdae2ec..5e1fd786e 100644 --- a/pages/common/git-revert.md +++ b/pages/common/git-revert.md @@ -13,7 +13,7 @@ - Revert multiple commits: -`git revert {{master~5..master~2}}` +`git revert {{branch_name~5..branch_name~2}}` - Don't create new commits, just change the working tree: diff --git a/pages/common/git-subtree.md b/pages/common/git-subtree.md index 78ad587c2..59ecfc8ce 100644 --- a/pages/common/git-subtree.md +++ b/pages/common/git-subtree.md @@ -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: