From 894ed10a579b64c4f6de8c5d490c1b538169fc86 Mon Sep 17 00:00:00 2001 From: Vincent Ging Ho Yim Date: Thu, 18 Jul 2024 22:28:40 +1000 Subject: [PATCH] docs/tutorial: remove reference to `jj amend` `jj amend` is discouraged and no longer a visible alias of `jj squash` since #3252. This is the only remaining occurrence of it in the docs. We should recommend using `jj squash` directly instead. --- docs/tutorial.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/tutorial.md b/docs/tutorial.md index 57894f4a8a0..4d06771bef9 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -153,8 +153,7 @@ If we later realize that we want to make further changes, we can make them in the working copy and then run `jj squash`. That command squashes (moves) the changes from a given commit into its parent commit. Like most commands, it acts on the working-copy commit by default. When run on the working-copy commit, it -behaves very similar to `git commit --amend`, and `jj amend` is in fact an alias -for `jj squash`. +behaves very similar to `git commit --amend`. Alternatively, we can use `jj edit ` to resume editing a commit in the working copy. Any further changes in the working copy will then amend the