From a1e0eeef386fb9799cbeb6b05a273babca865703 Mon Sep 17 00:00:00 2001 From: Matt Artist Date: Fri, 3 Jun 2022 11:34:54 -0400 Subject: [PATCH] [ci skip] Changing the order of the rebase with autosquash command in the contributing.md (#6974) --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 77225d6ec9..88367a7c4e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -168,7 +168,7 @@ move it under the line of the patch you wish to modify; assist you too. - Alternatively, if you only know the name of the patch, you can do `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 need to "save" the changes. 1. Type `./gradlew rebuildPatches` in the root directory;