document the jj equivalent of git reset --soft
#2976
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jyn514
force-pushed
the
push-vtvmzysmmmuk
branch
from
48a8a73 to
9a005d7
Compare
martinvonz
reviewed
Feb 7, 2024
jyn514
force-pushed
the
push-vtvmzysmmmuk
branch
from
9a005d7 to
f87fe37
Compare
martinvonz
approved these changes
Feb 9, 2024
i did the following things: 1. make some changes to the working copy 2. run `jj commit` 3. before i added a description, i decided i didn't want to commit yet. in git, the way to do this is to delete the contents of the editor; git sees that it is blank and aborts the commit. in jj, this doesn't work, because descriptions are allowed to be empty. now i have the following jj state: ``` ; jj log --stat @ pokrsyvs [email protected] 2024-02-06 21:48:17.000 -05:00 ddd6217f │ (empty) (no description set) │ 0 files changed, 0 insertions(+), 0 deletions(-) ◉ lqqmzmku [email protected] 2024-02-06 21:48:02.000 -05:00 HEAD@git b03bf3de │ (no description set) │ config/jj.toml | 2 +- │ 1 file changed, 1 insertion(+), 1 deletion(-) ◉ xqkmwvwp [email protected] 2024-02-06 21:47:08.000 -05:00 master b673f97b ``` i want to undo the most recent commit, `lqqmzmku`. i'm used to doing this with `git reset --soft HEAD~`, which makes the parent `xqkmwvwp` and leaves the change to `config/jj.toml` on disk while removing it from the git history; basically `lqqmzmku` would go back to being the working copy. i found that `jj move` does what i want, but it took a lot of trawling the options, it wasn't obvious, and i couldn't find `git reset` mentioned in the docs.
jyn514
force-pushed
the
push-vtvmzysmmmuk
branch
from
f87fe37 to
0db5b00
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
If applicable:
CHANGELOG.md