ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

squash doc: --keep-emptied let the description unchanged

Browse source
This commit is contained in:
Samuel Tardieu 2024-09-16 22:54:12 +02:00
parent 4308e1a21e
commit c1a032fad6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/src/commands/squash.rs
View file

@ -48,7 +48,7 @@ use crate::ui::Ui;
/// parent(s), and `--keep-emptied` is not set, it will be abandoned. Without
/// `--interactive` or paths, the source revision will always be empty.
///
/// If the source became empty and both the source and destination had a
/// If the source was abandoned 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.
///

2
cli/tests/cli-reference@.md.snap
View file

@ -1907,7 +1907,7 @@ With the `--from` and/or `--into` options, moves changes from/to the given revis
If, after moving changes out, the source revision is empty compared to its parent(s), and `--keep-emptied` is not set, it will be abandoned. Without `--interactive` or paths, 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 the source was abandoned 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.