github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-25 15:02:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14 from dbkinder/contrib1

Browse Source 
doc: fix formatting errors in contribution guide
This commit is contained in:
David Kinder 2018-03-08 22:37:50 -08:00 committed by GitHub
commit b4b3ebcb9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 52 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contribute.rst
View File

@ -255,7 +255,7 @@ workflow here:
below for specific guidelines for writing your commit messages. below for specific guidelines for writing your commit messages.
#. Push your topic branch with your changes to your fork in your personal #. Push your topic branch with your changes to your fork in your personal
GitHub account: GitHub account::
git push origin fix_comment_typo git push origin fix_comment_typo
@ -267,10 +267,6 @@ workflow here:
for the appropriate branch. The title and message from your commit message should for the appropriate branch. The title and message from your commit message should
appear as well. appear as well.
#. If you’re working on a subsystem branch that’s not master, you may need to change
the intended branch for the pull request here, for example, by changing the base
branch from master to net.
#. GitHub will assign one or more suggested reviewers (based on the CODEOWNERS file #. GitHub will assign one or more suggested reviewers (based on the CODEOWNERS file
in the repo). If you are a project member, you can select additional reviewers in the repo). If you are a project member, you can select additional reviewers
now too. now too.
@ -281,7 +277,7 @@ workflow here:
#. While you’re waiting for your pull request to be accepted and merged, you can #. While you’re waiting for your pull request to be accepted and merged, you can
create another branch to work on another issue. (Be sure to make your new branch create another branch to work on another issue. (Be sure to make your new branch
off of master and not the previous branch.): off of master and not the previous branch.)::
git checkout master git checkout master
git checkout -b fix_another_issue git checkout -b fix_another_issue
@ -289,13 +285,13 @@ workflow here:
and use the same process described above to work on this new topic branch. and use the same process described above to work on this new topic branch.
#. If reviewers do request changes to your patch, you can interactively rebase #. If reviewers do request changes to your patch, you can interactively rebase
commit(s) to fix review issues. In your development repo: commit(s) to fix review issues. In your development repo::
git fetch --all git fetch --all
git rebase --ignore-whitespace upstream/master git rebase --ignore-whitespace upstream/master
The --ignore-whitespace option stops git apply (called by rebase) from changing The ``--ignore-whitespace`` option stops git apply (called by rebase) from changing
any whitespace. Continuing: any whitespace. Continuing::
git rebase -i <offending-commit-id> git rebase -i <offending-commit-id>
@ -303,12 +299,13 @@ workflow here:
commit (if there’s more than one in your pull request), or remove the line to commit (if there’s more than one in your pull request), or remove the line to
delete a commit entirely. Then edit files to fix the issues in the review. delete a commit entirely. Then edit files to fix the issues in the review.
As before, inspect and test your changes. When ready, continue the patch submission: As before, inspect and test your changes. When ready, continue the
patch submission::
git add [file(s)] git add [file(s)]
git rebase --continue git rebase --continue
Update commit comment if needed, and continue: Update commit comment if needed, and continue::
git push --force origin fix_comment_typo git push --force origin fix_comment_typo
@ -316,7 +313,6 @@ workflow here:
your changes so you won’t need to resubmit the pull request. your changes so you won’t need to resubmit the pull request.
Commit Guidelines Commit Guidelines
***************** *****************