diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2015-09-20 05:45:06 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2015-09-20 05:45:06 -0700 |
| commit | b11a44e5b4d15092eb8dcf95ed3234e832c20a91 (patch) | |
| tree | 3b20cdd777b9a00dd026d31497adcf7e075f1973 | |
| parent | 88e1aa94fa0a0494b9808aaf9adec850444e3dbe (diff) | |
| parent | 6dca640cb229f855927c3076cc482d3089ad63fc (diff) | |
| download | ansible-b11a44e5b4d15092eb8dcf95ed3234e832c20a91.tar.gz | |
Merge pull request #12097 from mgedmin/patch-1
Fix typo, remove redundant paragraph
| -rw-r--r-- | docsite/rst/community.rst | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/docsite/rst/community.rst b/docsite/rst/community.rst index 845c2f0355..4afd6cdada 100644 --- a/docsite/rst/community.rst +++ b/docsite/rst/community.rst @@ -150,12 +150,9 @@ to modify a pull request later. When submitting patches, be sure to run the unit tests first “make tests” and always use, these are the same basic tests that will automatically run on Travis when creating the PR. There are more in depth tests in the tests/integration directory, classified as destructive and non_destructive, run these if they pertain to your modification. They are setup -with tags so you can run subsets, some of the tests requrie cloud credentials and will only run if they are provided. +with tags so you can run subsets, some of the tests require cloud credentials and will only run if they are provided. When adding new features of fixing bugs it would be nice to add new tests to avoid regressions. -Use “git rebase” vs “git merge” (aliasing git pull to git pull --rebase is a great idea) to avoid merge commits in -your submissions. There are also integration tests that can be run in the "test/integration" directory. - In order to keep the history clean and better audit incoming code, we will require resubmission of pull requests that contain merge commits. Use "git pull --rebase" vs "git pull" and "git rebase" vs "git merge". Also be sure to use topic branches to keep your additions on different branches, such that they won't pick up stray commits later. |