diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-16 18:54:51 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-16 18:54:51 +0000 |
| commit | 8aaf3c1e553d18b40d9980951d496bffad56f37b (patch) | |
| tree | 2eddd2b50a5924420b30caa5c6d867f4870a71dc /railties/guides/source/contributing_to_ruby_on_rails.textile | |
| parent | 9abc94c44516afdcfe4a3b202c336c9578fd6d0d (diff) | |
| parent | 0eae62525696b57fe7fc4bbb0bf9c0bc7ee4e480 (diff) | |
| download | rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.tar.gz rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.tar.bz2 rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'railties/guides/source/contributing_to_ruby_on_rails.textile')
| -rw-r--r-- | railties/guides/source/contributing_to_ruby_on_rails.textile | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile index 4ba01a2a8f..846a25d6d2 100644 --- a/railties/guides/source/contributing_to_ruby_on_rails.textile +++ b/railties/guides/source/contributing_to_ruby_on_rails.textile @@ -364,19 +364,6 @@ Please make sure the patch does not introduce whitespace errors: $ git apply --whitespace=error-all mynew_patch.diff </shell> -You can check your patches by applying your patch to an different dedicated branch: - -<shell> -$ git checkout -b testing_branch -$ git apply --check my_new_patch.diff -</shell> - -You can make sure your patches don't add any whitespace by applying it yourself using the --whitespace=error-all option. Make sure you are on your dedicated test branche and: - -<shell> -$ git apply --whitespace=error-all mynew_patch.diff -</shell> - h4. Create a Lighthouse Ticket |