| OLD | NEW |
| 1 The git-cl README describes the git-cl command set. This document | 1 The git-cl README describes the git-cl command set. This document |
| 2 describes how code review and git work together in general, intended | 2 describes how code review and git work together in general, intended |
| 3 for people familiar with git but unfamiliar with the code review | 3 for people familiar with git but unfamiliar with the code review |
| 4 process supported by Rietveld. | 4 process supported by Rietveld. |
| 5 | 5 |
| 6 == Concepts and terms | 6 == Concepts and terms |
| 7 A Rietveld review is for discussion of a single change or patch. You | 7 A Rietveld review is for discussion of a single change or patch. You |
| 8 upload a proposed change, the reviewer comments on your change, and | 8 upload a proposed change, the reviewer comments on your change, and |
| 9 then you can upload a revised version of your change. Rietveld stores | 9 then you can upload a revised version of your change. Rietveld stores |
| 10 the history of uploaded patches as well as the comments, and can | 10 the history of uploaded patches as well as the comments, and can |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 | 90 |
| 91 O---A---B---C | 91 O---A---B---C |
| 92 \ \ \ | 92 \ \ \ |
| 93 A'--B'--C' | 93 A'--B'--C' |
| 94 | 94 |
| 95 Which is ugly, but it accurately tracks the real history of your work, can | 95 Which is ugly, but it accurately tracks the real history of your work, can |
| 96 be thrown away at the end by committing A+A' as a single "squash" commit. | 96 be thrown away at the end by committing A+A' as a single "squash" commit. |
| 97 | 97 |
| 98 In practice, this comes up pretty rarely. Suggestions for better workflows | 98 In practice, this comes up pretty rarely. Suggestions for better workflows |
| 99 are welcome. | 99 are welcome. |
| OLD | NEW |