diff options
| author | Matt Artist <[email protected]> | 2022-06-03 11:34:54 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-06-03 16:34:54 +0100 |
| commit | 4d83ed0ae112f4b704f7447d4f738be7878997e3 (patch) | |
| tree | 59f43202049f0ed05bb29ed52c17cae4269eaca2 | |
| parent | bed5cb2b81033f30be5a3edace00534a13ad2631 (diff) | |
| download | Paper-4d83ed0ae112f4b704f7447d4f738be7878997e3.tar.gz Paper-4d83ed0ae112f4b704f7447d4f738be7878997e3.zip | |
[ci skip] Changing the order of the rebase with autosquash command in the contributing.md (#6974)
| -rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a0852dcd0e..031b10ee53 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; |