| OLD | NEW |
| 1 How to submit a patch | 1 How to submit a patch |
| 2 ===================== | 2 ===================== |
| 3 | 3 |
| 4 | 4 |
| 5 Configure git | 5 Configure git |
| 6 ------------- | 6 ------------- |
| 7 | 7 |
| 8 <!--?prettify lang=sh?--> | 8 <!--?prettify lang=sh?--> |
| 9 | 9 |
| 10 git config --global user.name "Your Name" | 10 git config --global user.name "Your Name" |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 Check in your changes | 192 Check in your changes |
| 193 --------------------- | 193 --------------------- |
| 194 | 194 |
| 195 ### Non-Skia-committers | 195 ### Non-Skia-committers |
| 196 | 196 |
| 197 If you already have committer rights, you can follow the directions below to | 197 If you already have committer rights, you can follow the directions below to |
| 198 commit your change directly to Skia's repository. | 198 commit your change directly to Skia's repository. |
| 199 | 199 |
| 200 If you don't have committer rights in https://skia.googlesource.com/skia.git ... | 200 If you don't have committer rights in https://skia.googlesource.com/skia.git ... |
| 201 first of all, thanks for submitting your patch! We really appreciate these | 201 first of all, thanks for submitting your patch! We really appreciate these |
| 202 submissions. Unfortunately, we don't yet have a way for Skia committers to mark | 202 submissions. After receiving an LGTM from a committer, you will be able to |
| 203 a patch as "approved" and thus allow non-committers to commit them. So instead, | 203 check the commit box and submit your patch via the commit queue. |
| 204 please ask a Skia committer to land your patch for you or land using the commit | |
| 205 queue. | |
| 206 | 204 |
| 207 As part of this process, the Skia committer may create a new codereview | 205 In special instances, a Skia committer may assist you in landing the change by |
| 208 containing your patch (perhaps with some small adjustments at her discretion). | 206 creating a new codereview containing your patch (perhaps with some small |
| 209 If so, you can mark your codereview as "Closed", and update it with a link to | 207 adjustments at his/her discretion). If so, you can mark your codereview as |
| 210 the new codereview. | 208 "Closed", and update it with a link to the new codereview. |
| 211 | 209 |
| 212 ### Skia committers: | 210 ### Skia committers |
| 213 * tips on how to apply the externally provided patch are [here](./patch) | 211 * tips on how to apply an externally provided patch are [here](./patch) |
| 214 * when landing externally contributed patches, please note the original | 212 * when landing externally contributed patches, please note the original |
| 215 contributor's identity (and provide a link to the original codereview) in t
he commit message | 213 contributor's identity (and provide a link to the original codereview) in t
he commit message |
| 216 | 214 |
| 217 git-cl will squash all your commits into a single one with the description you u
sed when you uploaded your change. | 215 git-cl will squash all your commits into a single one with the description y
ou used when you uploaded your change. |
| 218 | 216 |
| 219 ~~~~ | 217 ~~~~ |
| 220 git cl land | 218 git cl land |
| 221 ~~~~ | 219 ~~~~ |
| 222 or | 220 |
| 223 ~~~~ | 221 or |
| 224 git cl land -c 'Contributor Name <email@example.com>' | 222 |
| 225 ~~~~ | 223 ~~~~ |
| 224 git cl land -c 'Contributor Name <email@example.com>' |
| 225 ~~~~ |
| OLD | NEW |