mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-01 00:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

docs/FAQ: fix incorrect change ID for commit removed as parent

Browse source
This commit is contained in:
Vincent Ging Ho Yim 2024-09-11 14:07:13 +10:00
parent f4c0baf712
commit e415c09ede
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/FAQ.md
View file

@ -219,8 +219,9 @@ Now you're ready to work:
- The private commit _wwwwwwww_ is the second parent of the merge commit. - The private commit _wwwwwwww_ is the second parent of the merge commit.
- The working copy (_vvvvvvvv_) contains changes from both. - The working copy (_vvvvvvvv_) contains changes from both.
As you work, squash your changes using `jj squash --into xxxxxxxx`. Or, you can As you work, squash your changes using `jj squash --into xxxxxxxx`. Or you can
keep your changes in a separate commit and remove _ttsqqnrx_ as a parent: keep your changes in a separate commit without the private commit _wwwwwwww_ as a
parent:
```shell ```shell
# Remove the private commit as a parent # Remove the private commit as a parent