Skip to content

Commit e446316

Browse files
OskarStarkwouterj
authored andcommitted
removed squashing stuff
added explanation, why it is no longer necessary
1 parent 82fa4ae commit e446316

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

contributing/code/patches.rst

+4-24
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@ in mind the following:
171171
* Do atomic and logically separate commits (use the power of ``git rebase`` to
172172
have a clean and logical history);
173173

174-
* Squash irrelevant commits that are just about fixing coding standards or
175-
fixing typos in your own code;
176-
177174
* Never fix coding standards in some existing code as it makes the code review
178175
more difficult;
179176

@@ -381,27 +378,10 @@ patch. Before re-submitting the patch, rebase with ``upstream/master`` or
381378
to avoid messing other branches in the repo (``--force`` tells Git that
382379
you really want to mess with things so do it carefully).
383380

384-
Often, moderators will ask you to "squash" your commits. This means you will
385-
convert many commits to one commit. To do this, use the rebase command:
386-
387-
.. code-block:: bash
388-
389-
$ git rebase -i upstream/master
390-
$ git push --force origin BRANCH_NAME
391-
392-
After you type this command, an editor will popup showing a list of commits:
393-
394-
.. code-block:: text
395-
396-
pick 1a31be6 first commit
397-
pick 7fc64b4 second commit
398-
pick 7d33018 third commit
399-
400-
To squash all commits into the first one, remove the word ``pick`` before the
401-
second and the last commits, and replace it by the word ``squash`` or just
402-
``s``. When you save, Git will start rebasing, and if successful, will ask
403-
you to edit the commit message, which by default is a listing of the commit
404-
messages of all the commits. When you are finished, execute the push command.
381+
Moderators earlier asked you to "squash" your commits. This means you will
382+
convert many commits to one commit. This is no longer necessary today, because
383+
Symfony project uses a proprietary tool which automatically squashes all commits
384+
before merging.
405385

406386
.. _ProGit: http://git-scm.com/book
407387
.. _GitHub: https://github.com/signup/free

0 commit comments

Comments
 (0)