From 2c2ab62c6ee4dd10c40276d4458fa5ed8d36afbc Mon Sep 17 00:00:00 2001 From: Anirudh Oppiliappan Date: Tue, 3 Jun 2025 13:24:17 +0300 Subject: [PATCH] stacking.md: fix typos Signed-off-by: Anirudh Oppiliappan --- pages/blog/stacking.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pages/blog/stacking.md b/pages/blog/stacking.md index 4380b10..fdb2d29 100644 --- a/pages/blog/stacking.md +++ b/pages/blog/stacking.md @@ -28,7 +28,7 @@ code-review, the "diff-soup" model and the interdiff model. ## the diff soup model -When you create a PR on traditional code-forges (GitHub +When you create a PR on traditional code forges (GitHub specifically), the UX implicitly encourages you to address your code review by *adding commits* on top of your original set of changes: @@ -37,7 +37,7 @@ set of changes: suggestion into your PR - GitHub only shows you the diff of all files at once by default -- It is difficult to know what changed across force-pushes +- It is difficult to know what changed across force pushes Consider a hypothetical PR that adds 3 commits: @@ -96,7 +96,7 @@ fearlessly edit, split, squash and rework old commits (you could do this with git if you are familiar with fixup commits or interactive rebasing). -Lets try that again: +Let's try that again: ``` [c] implement new feature across the board (HEAD) @@ -161,7 +161,7 @@ And this is the essence of our new stacked PRs feature! ## interdiff code review on tangled -To really explain how this works, lets start with a [new +To really explain how this works, let's start with a [new codebase](https://tangled.sh/@oppi.li/stacking-demo/): ``` @@ -249,7 +249,7 @@ $ jj log ├ my set: introduce basic set operations ~ -# lets edit the implementation of `Union` +# let's edit the implementation of `Union` $ jj edit mk # hack, hack, hack @@ -268,7 +268,7 @@ Next, let us address the bug: > there is a logic bug here, the condition should be negated. ``` -# lets edit the implementation of `Difference` +# let's edit the implementation of `Difference` $ jj edit so # hack, hack, hack @@ -358,7 +358,5 @@ write-change-id-header = true ``` This feature writes `change-id` headers directly into the -git commit object, and is visible to code-forges upon push, +git commit object, and is visible to code forges upon push, and allows you to stack your PRs on Tangled. - - -- 2.51.2