diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-03-01 08:36:44 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-03-01 08:36:44 +0000 |
| commit | 48d7ed63912053a2a20f4352b7119ce267eb06fa (patch) | |
| tree | 6541aba9e4a1edf2dbfea3efeb6bc3774dd808cc | |
| parent | c8f981964af6b32b9166b91cfc211b41150c6add (diff) | |
| parent | 05139d38fdc3c2ed3bd46a8e2d6a1fedc7ec21c2 (diff) | |
| download | gitlab-ce-48d7ed63912053a2a20f4352b7119ce267eb06fa.tar.gz | |
Merge branch '28696-improve-grammar-gitlab-flow-doc' into 'master'
Grammar improvement in gitlab flow intro doc
Closes #28696
See merge request !9552
| -rw-r--r-- | changelogs/unreleased/28696-improve-grammar-gitlab-flow-doc.yml | 4 | ||||
| -rw-r--r-- | doc/workflow/gitlab_flow.md | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelogs/unreleased/28696-improve-grammar-gitlab-flow-doc.yml b/changelogs/unreleased/28696-improve-grammar-gitlab-flow-doc.yml new file mode 100644 index 00000000000..e38e5d0db5b --- /dev/null +++ b/changelogs/unreleased/28696-improve-grammar-gitlab-flow-doc.yml @@ -0,0 +1,4 @@ +--- +title: Improve grammar in GitLab flow documentation +merge_request: 9552 +author: infogrind diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index 4889e3ec50c..d12c0c6d0c4 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -203,7 +203,7 @@ But the advantages of having stable identifiers outweigh this drawback. And to understand a change in context one can always look at the merge commit that groups all the commits together when the code is merged into the master branch. After you merge multiple commits from a feature branch into the master branch this is harder to undo. -If you would have squashed all the commits into one you could have just reverted this commit but as we indicated you should not rebase commits after they are pushed. +If you had squashed all the commits into one you could have just reverted this commit but as we indicated you should not rebase commits after they are pushed. Fortunately [reverting a merge made some time ago](https://git-scm.com/blog/2010/03/02/undoing-merges.html) can be done with git. This however, requires having specific merge commits for the commits your want to revert. If you revert a merge and you change your mind, revert the revert instead of merging again since git will not allow you to merge the code again otherwise. |