From 068f511b3f070a6651ab09ebbc3661cb8e74eefb Mon Sep 17 00:00:00 2001 From: Philip Metzger Date: Mon, 29 Jan 2024 19:56:42 +0100 Subject: [PATCH] FAQ: Make a question clearer. It seems that "amended" is not clear enough for users. So use simpler terms. Suggestion from ilyagr in [Discord](https://discord.com/channels/968932220549103686/1201196831653236756/1201268055678931147). --- docs/FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/FAQ.md b/docs/FAQ.md index 8f9002d7d..f1fc6dbf1 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -121,7 +121,7 @@ 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. -### I accidentally amended the working copy. How do I move the new changes into its own commit? +### 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