logo

drewdevault.com

[mirror] blog and personal website of Drew DeVault git clone https://hacktivis.me/git/mirror/drewdevault.com.git
commit: 9450f633dfa27a2995a49f05ab263e38251d6c22
parent df9eaa135ca81f8ff6aeba71b0b0f9b5b5833dfc
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue, 10 Dec 2024 21:03:11 +0100

Fix typo, thanks stacee!

Diffstat:

Mcontent/blog/2024-12-10-Daily-driving-jujutsu.md10+++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/content/blog/2024-12-10-Daily-driving-jujutsu.md b/content/blog/2024-12-10-Daily-driving-jujutsu.md @@ -49,11 +49,11 @@ my "wow" moment with Jujutsu. One day I was working on a large-ish change. I had written a few commits over the course of the day towards this end. However, I noticed that I had overlooked something in a commit three or four commits earlier. So I touched up the -relevant code and then ran `jj squash -i <commit ID>` to squash the changes into -the earlier `<commit ID>`. This command fires up an interface similar to git add --p, which interactively presented me with hunks out of my working directory to -choose from. I found the one I wanted, selected it, then dismissed the -interactive thingy with a quick keystroke. And it was done! +relevant code and then ran `jj squash -i -t <commit ID>` to squash the changes +into the earlier `<commit ID>`. This command fires up an interface similar to +git add -p, which interactively presented me with hunks out of my working +directory to choose from. I found the one I wanted, selected it, then dismissed +the interactive thingy with a quick keystroke. And it was done! There are some hidden details in this story that I want to draw your attention to. When I edited this earlier commit, I was in the middle of working on