From fcb4ac9d6b90878a15a68d797384e49e8204b37d Mon Sep 17 00:00:00 2001 From: "jj-docs[bot]" Date: Mon, 11 Mar 2024 16:25:46 +0000 Subject: [PATCH] Deployed e9655db to prerelease with MkDocs 1.5.3 and mike 2.0.0 --- prerelease/FAQ/index.html | 5 ++--- prerelease/cli-reference/index.html | 10 +++++++--- prerelease/git-comparison/index.html | 6 +++--- prerelease/search/search_index.json | 2 +- prerelease/sitemap.xml.gz | Bin 469 -> 469 bytes prerelease/tutorial/index.html | 6 +++--- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/prerelease/FAQ/index.html b/prerelease/FAQ/index.html index 1c2f4ed1b0..a9d451e06a 100644 --- a/prerelease/FAQ/index.html +++ b/prerelease/FAQ/index.html @@ -1591,9 +1591,8 @@

(note the +) to move them all at once.

An alternative workflow would be to rebase the commit with local changes on top of the PR you're working on and then do jj new commit_with_local_changes. -You'll then need to use jj new --before to create new commits -and jj move --to -to move new changes into the correct commits.

+You'll then need to use jj new --before to create new commits and +jj squash --into to move new changes into the correct commits.

I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?

Use jj obslog -p to see how your working-copy commit has evolved. Find the commit you want to restore the contents to. Let's say the current commit (with diff --git a/prerelease/cli-reference/index.html b/prerelease/cli-reference/index.html index 3de0d30406..c4b9bd4bff 100644 --- a/prerelease/cli-reference/index.html +++ b/prerelease/cli-reference/index.html @@ -5533,7 +5533,7 @@

Subcommands:Options:jj squash
-

Move changes from a revision into its parent

-

After moving the changes into the parent, the child revision will have the same content state as before. If that means that the change is now empty compared to its parent, it will be abandoned. Without --interactive, the child change will always be empty.

+

Move changes from a revision into another revision

+

With the -r option, moves the changes from the specified revision to the parent revision. Fails if there are several parent revisions (i.e., the given revision is a merge).

+

With the --from and/or --into options, moves changes from/to the given revisions. If either is left out, it defaults to the working-copy commit. For example, jj squash --into @-- moves changes from the working-copy commit to the grandparent.

+

If, after moving changes out, the source revision is empty compared to its parent(s), it will be abandoned. Without --interactive, the source revision will always be empty.

If the source became empty and both the source and destination had a non-empty description, you will be asked for the combined description. If either was empty, then the other one will be used.

If a working-copy commit gets abandoned, it will be given a new, empty commit. This is true in general; it is not specific to this command.

Usage: jj squash [OPTIONS] [PATHS]...

@@ -6786,6 +6788,8 @@
Arguments:Options: