sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed text about interactive rebase

Browse Source
This commit is contained in:
Adam Feuer 2020-09-04 14:38:36 -07:00 committed by Matias N
parent dcf32363c2
commit c1eb911814
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/contributing/making-changes.rst
View File

@ -189,12 +189,6 @@ squash before submitting the Pull Request:
#. Rebase onto the upstream code #. Rebase onto the upstream code
* Your favorite text editor will start and shows the commands for the interactive rebasing.
* Change the "pick" to "squash" for all the commits you want to squash.
* For the series of commits to squash, keep the first one with "pick".
* Once you save and exist your editor will start again to merge all the commit messages.
* Add a commit message that best describes your change then save and exit.
.. code-block:: bash .. code-block:: bash
$ git rebase upstream/master $ git rebase upstream/master