Commit 724db4bb authored by Russell Dickenson's avatar Russell Dickenson

Merge branch 'aqualls-fixes-create-docs' into 'master'

Remove gerunds from some subheadings

See merge request gitlab-org/gitlab!69254
parents 1217b5eb bbad55f7
...@@ -438,7 +438,7 @@ WARNING: ...@@ -438,7 +438,7 @@ WARNING:
- For merge requests that have had [Squash and - For merge requests that have had [Squash and
merge](../user/project/merge_requests/squash_and_merge.md#squash-and-merge) set, merge](../user/project/merge_requests/squash_and_merge.md#squash-and-merge) set,
the squashed commit’s default commit message is taken from the merge request title. the squashed commit’s default commit message is taken from the merge request title.
You're encouraged to [select a commit with a more informative commit message](../user/project/merge_requests/squash_and_merge.md#overview) before merging. You're encouraged to [select a commit with a more informative commit message](../user/project/merge_requests/squash_and_merge.md) before merging.
Thanks to **Pipeline for Merged Results**, authors no longer have to rebase their Thanks to **Pipeline for Merged Results**, authors no longer have to rebase their
branch as frequently anymore (only when there are conflicts) because the Merge branch as frequently anymore (only when there are conflicts) because the Merge
......
...@@ -34,8 +34,8 @@ The following resources can help you get started with Git: ...@@ -34,8 +34,8 @@ The following resources can help you get started with Git:
- [Edit files through the command line](../../gitlab-basics/command-line-commands.md) - [Edit files through the command line](../../gitlab-basics/command-line-commands.md)
- [GitLab Git Cheat Sheet (download)](https://about.gitlab.com/images/press/git-cheat-sheet.pdf) - [GitLab Git Cheat Sheet (download)](https://about.gitlab.com/images/press/git-cheat-sheet.pdf)
- Commits: - Commits:
- [Revert a commit](../../user/project/merge_requests/revert_changes.md#reverting-a-commit) - [Revert a commit](../../user/project/merge_requests/revert_changes.md#revert-a-commit)
- [Cherry-picking a commit](../../user/project/merge_requests/cherry_pick_changes.md#cherry-picking-a-commit) - [Cherry-picking a commit](../../user/project/merge_requests/cherry_pick_changes.md#cherry-pick-a-commit)
- [Squashing commits](../gitlab_flow.md#squashing-commits-with-rebase) - [Squashing commits](../gitlab_flow.md#squashing-commits-with-rebase)
- [Squash-and-merge](../../user/project/merge_requests/squash_and_merge.md) - [Squash-and-merge](../../user/project/merge_requests/squash_and_merge.md)
- [Signing commits](../../user/project/repository/gpg_signed_commits/index.md) - [Signing commits](../../user/project/repository/gpg_signed_commits/index.md)
......
...@@ -209,7 +209,7 @@ To recover from multiple incorrect commits: ...@@ -209,7 +209,7 @@ To recover from multiple incorrect commits:
The commits are now `A-B-C-D-E`. The commits are now `A-B-C-D-E`.
Alternatively, with GitLab, Alternatively, with GitLab,
you can [cherry-pick](../../../user/project/merge_requests/cherry_pick_changes.md#cherry-picking-a-commit) you can [cherry-pick](../../../user/project/merge_requests/cherry_pick_changes.md#cherry-pick-a-commit)
that commit into a new merge request. that commit into a new merge request.
NOTE: NOTE:
......
...@@ -11,7 +11,7 @@ GitLab implements Git's powerful feature to ...@@ -11,7 +11,7 @@ GitLab implements Git's powerful feature to
[cherry-pick any commit](https://git-scm.com/docs/git-cherry-pick "Git cherry-pick documentation") [cherry-pick any commit](https://git-scm.com/docs/git-cherry-pick "Git cherry-pick documentation")
with a **Cherry-pick** button in merge requests and commit details. with a **Cherry-pick** button in merge requests and commit details.
## Cherry-picking a merge request ## Cherry-pick a merge request
After the merge request has been merged, a **Cherry-pick** button displays After the merge request has been merged, a **Cherry-pick** button displays
to cherry-pick the changes introduced by that merge request. to cherry-pick the changes introduced by that merge request.
...@@ -25,7 +25,7 @@ where you can choose to either: ...@@ -25,7 +25,7 @@ where you can choose to either:
- Cherry-pick the changes directly into the selected branch. - Cherry-pick the changes directly into the selected branch.
- Create a new merge request with the cherry-picked changes. - Create a new merge request with the cherry-picked changes.
### Cherry-pick tracking ### Track a cherry-pick
> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2675) in GitLab 12.9. > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2675) in GitLab 12.9.
...@@ -40,7 +40,7 @@ NOTE: ...@@ -40,7 +40,7 @@ NOTE:
We only track cherry-pick executed from GitLab (both UI and API). Support for tracking cherry-picked commits through the command line We only track cherry-pick executed from GitLab (both UI and API). Support for tracking cherry-picked commits through the command line
is tracked [in this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/202215). is tracked [in this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/202215).
## Cherry-picking a commit ## Cherry-pick a commit
You can cherry-pick a commit from the commit details page: You can cherry-pick a commit from the commit details page:
......
...@@ -5,12 +5,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -5,12 +5,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference, concepts type: reference, concepts
--- ---
# Reverting changes **(FREE)** # Revert changes **(FREE)**
You can use Git's powerful feature to [revert any commit](https://git-scm.com/docs/git-revert "Git revert documentation") You can use Git's powerful feature to [revert any commit](https://git-scm.com/docs/git-revert "Git revert documentation")
by clicking the **Revert** button in merge requests and commit details. by clicking the **Revert** button in merge requests and commit details.
## Reverting a merge request ## Revert a merge request
NOTE: NOTE:
The **Revert** button is available only for merge requests The **Revert** button is available only for merge requests
...@@ -34,7 +34,7 @@ create a new merge request with the revert changes. ...@@ -34,7 +34,7 @@ create a new merge request with the revert changes.
After the merge request has been reverted, the **Revert** button is no longer available. After the merge request has been reverted, the **Revert** button is no longer available.
## Reverting a commit ## Revert a commit
You can revert a commit from the commit details page: You can revert a commit from the commit details page:
......
...@@ -12,8 +12,6 @@ type: reference, concepts ...@@ -12,8 +12,6 @@ type: reference, concepts
With squash and merge you can combine all your merge request's commits into one With squash and merge you can combine all your merge request's commits into one
and retain a clean history. and retain a clean history.
## Overview
Squashing lets you tidy up the commit history of a branch when accepting a merge Squashing lets you tidy up the commit history of a branch when accepting a merge
request. It applies all of the changes in the merge request as a single commit, request. It applies all of the changes in the merge request as a single commit,
and then merges that commit using the merge method set for the project. and then merges that commit using the merge method set for the project.
...@@ -58,7 +56,7 @@ meaningful commit messages and: ...@@ -58,7 +56,7 @@ meaningful commit messages and:
- It's simpler to [revert](revert_changes.md) if necessary. - It's simpler to [revert](revert_changes.md) if necessary.
- The merged branch retains the full commit history. - The merged branch retains the full commit history.
## Enabling squash for a merge request ## Enable squash for a merge request
Anyone who can create or edit a merge request can choose for it to be squashed Anyone who can create or edit a merge request can choose for it to be squashed
on the merge request form. Users can select or clear the checkbox when they on the merge request form. Users can select or clear the checkbox when they
...@@ -98,7 +96,7 @@ it. This is because squashing is only available when accepting a merge request, ...@@ -98,7 +96,7 @@ it. This is because squashing is only available when accepting a merge request,
so a merge request may need to be rebased before squashing, even though so a merge request may need to be rebased before squashing, even though
squashing can itself be considered equivalent to rebasing. squashing can itself be considered equivalent to rebasing.
## Squash Commits Options ## Squash commits options
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/17613) in GitLab 13.2. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/17613) in GitLab 13.2.
> - Deployed behind a feature flag, disabled by default. > - Deployed behind a feature flag, disabled by default.
......
...@@ -50,10 +50,10 @@ to a branch in the repository. When you use the command line, you can commit mul ...@@ -50,10 +50,10 @@ to a branch in the repository. When you use the command line, you can commit mul
on their respective thread. on their respective thread.
- **Cherry-pick a commit:** - **Cherry-pick a commit:**
In GitLab, you can In GitLab, you can
[cherry-pick a commit](../merge_requests/cherry_pick_changes.md#cherry-picking-a-commit) [cherry-pick a commit](../merge_requests/cherry_pick_changes.md#cherry-pick-a-commit)
from the UI. from the UI.
- **Revert a commit:** - **Revert a commit:**
[Revert a commit](../merge_requests/revert_changes.md#reverting-a-commit) [Revert a commit](../merge_requests/revert_changes.md#revert-a-commit)
from the UI to a selected branch. from the UI to a selected branch.
- **Sign a commit:** - **Sign a commit:**
Use GPG to [sign your commits](gpg_signed_commits/index.md). Use GPG to [sign your commits](gpg_signed_commits/index.md).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment