@@ -200,7 +200,7 @@ When your patch is not about a bug fix (when you add a new feature or change
200200an existing one for instance), it must also include the following:
201201
202202* 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);
204204
205205* An explanation on how to upgrade an existing application in the relevant
206206 ``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:
396396
397397pick `` before the
398398second 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-
401-
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.
402402
403403.. _ProGit :http://git-scm.com/book
404404.. _GitHub :https://github.com/signup/free