From 29beea04463b4e344b2baff80df67c2e288960eb Mon Sep 17 00:00:00 2001 From: Samuel Sadok Date: Tue, 13 Mar 2018 00:51:21 -0700 Subject: [PATCH] clarify readme clarification --- Firmware/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/README.md b/Firmware/README.md index ffd001ac..e3bb40f8 100644 --- a/Firmware/README.md +++ b/Firmware/README.md @@ -318,7 +318,7 @@ You will likely want the pinout for this process. It is available [here](https:/ If you made changes to CubeMX generated files outside of the `USER CODE BEGIN`...`USER CODE END` sections and contribute them back, please add a patch file so that the next person who runs CubeMX doesn't run into problems. The way described here will use git to revert your changes and then revert the revert on top of that, thus giving you a commit that represents the exact patch that you want to export. * Make sure your current desired state is committed. * Make a new temporary branch: `git checkout -b cubemx_temp` -* Run the CubeMX code generation as described in the previous section. +* Run the CubeMX code generation as described in the previous section, including applying patches. * The diff will now _not_ be empty since CubeMX reversed your changes. * Stage the falsely reversed file and make a commit with the message "bogus commit". * Run `git revert HEAD` to revert the bogus commit. This gives you the "double negative" commit which you will export, so write a meaningful commit message.