Skip to content

Commit 36b75c7

Browse files
JaimeLennoxaschmolck
authored andcommitted
README: spelling/grammar fixes
1 parent 846891a commit 36b75c7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ docker run \
181181
--gitlab-url='http://your.gitlab.instance.com'
182182
```
183183

184-
For completeness sake, here's how we run marge-bot at smarkets ourselves:
184+
For completeness sake, here's how we run marge-bot at Smarkets ourselves:
185185
```bash
186186
docker run \
187187
-e MARGE_AUTH_TOKEN="$(cat marge-bot.token)" \
@@ -209,7 +209,7 @@ Once running, the bot will continuously monitor all projects that have its user
209209
will pick up any changes in membership at runtime.
210210
211211
212-
## Suggested worfklow
212+
## Suggested workflow
213213
1. Alice creates a new merge request and assigns Bob and Charlie as reviewers
214214
215215
2. Both review the code and after all issues they raise are resolved by Alice,
@@ -232,7 +232,7 @@ two [standardized git commit trailers](https://www.kernel.org/doc/html/v4.11/pro
232232
the name of the `marge-bot` user in GitLab).
233233
234234
If you pass `--add-reviewers` and the list of approvers is non-empty and you
235-
have enough approvers to meet the required approver count, Marge will add a the
235+
have enough approvers to meet the required approver count, Marge will add the
236236
following header to each commit message and each reviewer as it rebases the
237237
target branch into your PR branch:
238238
@@ -361,7 +361,7 @@ look-ahead and will match any string not starting with `project/with_reviewers`.
361361
## Restricting the list of branches marge-bot considers
362362
363363
It is also possible to restrict the branches marge-bot watches for incoming
364-
merge requests. By default, marge-bot will process MRs targetted for any branch.
364+
merge requests. By default, marge-bot will process MRs targeted for any branch.
365365
You may specify a regexp that target branches must match with `--branch-regexp`.
366366
367367
This could be useful, if for instance, you wanted to set a regular freeze
@@ -387,7 +387,7 @@ git config --global alias.revert-mr '!f() { REVS=$(git mr-revs "$1"); URL="$(git
387387
```
388388
389389
E.g. `git revert-mr 123`. This will create a single commit reverting all commits
390-
that are part of MR 123 with a a commit message that looks like this:
390+
that are part of MR 123 with a commit message that looks like this:
391391
392392
```
393393
Revert <http://gitlab.example.com/mygropup/myproject/merge_requests/123>

0 commit comments

Comments
 (0)