You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pr...@apache.org on 2020/09/04 23:02:48 UTC
[incubator-nuttx] 07/10: removed text about interactive rebase
This is an automated email from the ASF dual-hosted git repository.
protobits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c1eb911814377e5c97f55290d3282e47615fb2ee
Author: Adam Feuer <ad...@adamfeuer.com>
AuthorDate: Fri Sep 4 14:38:36 2020 -0700
removed text about interactive rebase
---
Documentation/contributing/making-changes.rst | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Documentation/contributing/making-changes.rst b/Documentation/contributing/making-changes.rst
index 9fd3254..88eca47 100644
--- a/Documentation/contributing/making-changes.rst
+++ b/Documentation/contributing/making-changes.rst
@@ -189,12 +189,6 @@ squash before submitting the Pull Request:
#. 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