@@ -181,7 +181,7 @@ docker run \
181
181
--gitlab-url=' http://your.gitlab.instance.com'
182
182
` ` `
183
183
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:
185
185
```bash
186
186
docker run \
187
187
-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
209
209
will pick up any changes in membership at runtime.
210
210
211
211
212
- ## Suggested worfklow
212
+ ## Suggested workflow
213
213
1. Alice creates a new merge request and assigns Bob and Charlie as reviewers
214
214
215
215
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
232
232
the name of the `marge-bot` user in GitLab).
233
233
234
234
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
236
236
following header to each commit message and each reviewer as it rebases the
237
237
target branch into your PR branch:
238
238
@@ -361,7 +361,7 @@ look-ahead and will match any string not starting with `project/with_reviewers`.
361
361
## Restricting the list of branches marge-bot considers
362
362
363
363
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.
365
365
You may specify a regexp that target branches must match with `--branch-regexp`.
366
366
367
367
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
387
387
```
388
388
389
389
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:
391
391
392
392
```
393
393
Revert <http://gitlab.example.com/mygropup/myproject/merge_requests/123>
0 commit comments