Update Contributor Guide

Jeremy Cline 2020-03-26 14:23:35 +00:00
parent 128f15fae6
commit 40b7c25fb2

@ -13,7 +13,7 @@ Quick start:
3. Make a change to a file or files in `redhat/`. 3. Make a change to a file or files in `redhat/`.
4. Add your changes with `git add -A`. 4. Add your changes with `git add -A`.
5. Commit your changes and write a nice commit message that explains the change: `git commit -s`. 5. Commit your changes and write a nice commit message that explains the change: `git commit -s`.
6. Open a merge request: `git push -o merge_request.create -o merge_request.target=internal -o merge_request.remove_source_branch -u <your-remote> my-build-change` 6. Open a merge request. You can do so via the web UI, or directly from a git push with `git push -o merge_request.create -o merge_request.target=internal -o merge_request.remove_source_branch -u <your-remote> my-build-change`. Refer to the [push options](https://docs.gitlab.com/ee/user/project/push_options.html) documentation for more details.
### Configuration Changes ### Configuration Changes
@ -49,7 +49,7 @@ To add or update a kernel patch carried for ARK, start a new branch based on ``a
1. `git fetch upstream` 1. `git fetch upstream`
2. `git checkout -b my-kernel-patch upstream/ark-patches` 2. `git checkout -b my-kernel-patch upstream/ark-patches`
3. Add commits any way you'd like (`git am`, `git cherry-pick -x`, etc). Patches are not likely to be excepted if they're not already on their way upstream. 3. Add commits any way you'd like (`git am`, `git cherry-pick -x`, etc). Patches are not likely to be excepted if they're not already on their way upstream.
4. Open a merge request against ``ark-patches``: ``git push -o merge_request.create -o merge_request.target=ark-patches -o merge_request.remove_source_branch -u <your-remote> my-kernel-patch`` 4. Open a merge request against ``ark-patches``. You can do so in the web UI, or directly from a git push command: ``git push -o merge_request.create -o merge_request.target=ark-patches -o merge_request.remove_source_branch -u <your-remote> my-kernel-patch``. Refer to the [push options](https://docs.gitlab.com/ee/user/project/push_options.html) documentation for more details.
### Commit messages ### Commit messages