Permalink
Browse files

bug #3455 [Contributing][Code] fix indentation so that the text is re…

…ndered properly (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

[Contributing][Code] fix indentation so that the text is rendered properly

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets |

Commits
-------

fe5abd3 fix indentation so that the text is rendered properly
  • Loading branch information...
weaverryan committed Jan 21, 2014
2 parents 65efcc4 + fe5abd3 commit 6831b1337f99c26d9f04eb82990cc3b3ac128de0
Showing with 4 additions and 4 deletions.
  1. +4 −4 contributing/code/patches.rst
@@ -200,7 +200,7 @@ When your patch is not about a bug fix (when you add a new feature or change
an existing one for instance), it must also include the following:
* An explanation of the changes in the relevant ``CHANGELOG`` file(s) (the
``[BC BREAK]`` or the ``[DEPRECATION]`` prefix must be used when relevant);
``[BC BREAK]`` or the ``[DEPRECATION]`` prefix must be used when relevant);
* An explanation on how to upgrade an existing application in the relevant
``UPGRADE`` file(s) if the changes break backward compatibility or if you
@@ -396,9 +396,9 @@ type this command, an editor will popup showing a list of commits:
To squash all commits into the first one, remove the word ``pick`` before the
second and the last commits, and replace it by the word ``squash`` or just
``s``. When you save, Git will start rebasing, and if successful, will ask
you to edit the commit message, which by default is a listing of the commit
messages of all the commits. When you are finished, execute the push command.
``s``. When you save, Git will start rebasing, and if successful, will ask
you to edit the commit message, which by default is a listing of the commit
messages of all the commits. When you are finished, execute the push command.
.. _ProGit: http://git-scm.com/book
.. _GitHub: https://github.com/signup/free

0 comments on commit 6831b13

Please sign in to comment.