Skip to content

Commit

Permalink
docs/tutorial: remove reference to jj amend
Browse files Browse the repository at this point in the history
`jj amend` is discouraged and no longer a visible alias of `jj squash` since jj-vcs#3252. This
is the only remaining occurrence of it in the docs. We should recommend using `jj
squash` directly instead.
  • Loading branch information
cenviity committed Nov 29, 2024
1 parent cb26c11 commit 54f46ce
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions docs/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <commit>` to resume editing a commit in the
working copy. Any further changes in the working copy will then amend the
Expand Down

0 comments on commit 54f46ce

Please sign in to comment.