@@ -200,7 +200,7 @@ When your patch is not about a bug fix (when you add a new feature or change
200
200
an existing one for instance), it must also include the following:
201
201
202
202
* An explanation of the changes in the relevant ``CHANGELOG `` file(s) (the
203
- ``[BC BREAK] `` or the ``[DEPRECATION] `` prefix must be used when relevant);
203
+ ``[BC BREAK] `` or the ``[DEPRECATION] `` prefix must be used when relevant);
204
204
205
205
* An explanation on how to upgrade an existing application in the relevant
206
206
``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:
396
396
397
397
To squash all commits into the first one, remove the word ``pick `` before the
398
398
second and the last commits, and replace it by the word ``squash `` or just
399
- ``s ``. When you save, Git will start rebasing, and if successful, will ask
400
- you to edit the commit message, which by default is a listing of the commit
401
- messages of all the commits. When you are finished, execute the push command.
399
+ ``s ``. When you save, Git will start rebasing, and if successful, will ask
400
+ you to edit the commit message, which by default is a listing of the commit
401
+ messages of all the commits. When you are finished, execute the push command.
402
402
403
403
.. _ProGit : http://git-scm.com/book
404
404
.. _GitHub : https://github.com/signup/free
0 commit comments