v01d commented on a change in pull request #1677:
URL: https://github.com/apache/incubator-nuttx/pull/1677#discussion_r483852732
##########
File path: Documentation/contributing/making-changes.rst
##########
@@ -202,6 +202,56 @@ squash before submitting the Pull Request:
$ git checkout my-branch
+#. Fetch the upstream code
+
+ .. code-block:: bash
+
+ $ git fetch upstream
+
+#. 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
+
+ $ git rebase upstream/master
+
+#. Push to your remote
+
+ This needs to a force push with ``-f``.
Review comment:
Force is not needed here since this would be the first push which
creates the remote branch. The force will only be needed if you squash, for
example, or if during reviews you are requested to rebase.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
