[ci skip] Changing the order of the rebase with autosquash command in the contributing.md (#6974)

This commit is contained in:
Matt Artist 2022-06-03 11:34:54 -04:00
parent 4f76ec1554
commit a1e0eeef38

View file

@ -168,7 +168,7 @@ move it under the line of the patch you wish to modify;
assist you too. assist you too.
- Alternatively, if you only know the name of the patch, you can do - Alternatively, if you only know the name of the patch, you can do
`git commit -a --fixup "Subject of Patch name"`. `git commit -a --fixup "Subject of Patch name"`.
1. Rebase with autosquash: `git rebase --autosquash -i base`. 1. Rebase with autosquash: `git rebase -i --autosquash base`.
This will automatically move your fixup commit to the right place, and you just This will automatically move your fixup commit to the right place, and you just
need to "save" the changes. need to "save" the changes.
1. Type `./gradlew rebuildPatches` in the root directory; 1. Type `./gradlew rebuildPatches` in the root directory;