mirror of
https://github.com/jj-vcs/jj.git
synced 2025-12-23 06:01:01 +00:00
684d62e8ae
Fixes https://github.com/jj-vcs/jj/discussions/5951 There have also been discussions on Discord on and off; people seem to agree that `--preserve-descendant-content` is clear if verbose. I hope that a short alias might address that (though I don't intent to make a habit of having many cryptic short aliases), though we could also decide to skip it for now and see whether it's really needed. Some other options considered: - `keep-descendant-content`. In theory, I like it better, but it'd be confusingly similar to `jj squash --keep-emptied` once `jj squash --keep-descendant-content` was implemented, and would also conflict with its tab completion. - `--preserve-descendant-contents` with `s` at the end. - The short version could be `-P`, but that would be confusable with `--preserve-content` for `jj rebase`, discussed below. Also, currently single-capital-letter flags are usually about lifting some restriction, e.g. `-B` for `--allow-backwards`. - `verbatim-descendants` - `reparent-descendants` The last two look a bit cryptic, depending on the person. Note that `jj rebase` will also need a `--preserve-content` flag for preserving the content of the commit actually being rebased. I'm not sure whether that should also be `--pc` or not. |
||
|---|---|---|
| .. | ||
| commands | ||
| config | ||
| merge_tools | ||
| cleanup_guard.rs | ||
| cli_util.rs | ||
| command_error.rs | ||
| commit_templater.rs | ||
| complete.rs | ||
| config-schema.json | ||
| config.rs | ||
| description_util.rs | ||
| diff_util.rs | ||
| formatter.rs | ||
| generic_templater.rs | ||
| git_util.rs | ||
| graphlog.rs | ||
| lib.rs | ||
| main.rs | ||
| movement_util.rs | ||
| operation_templater.rs | ||
| progress.rs | ||
| revset_util.rs | ||
| template.pest | ||
| template_builder.rs | ||
| template_parser.rs | ||
| templater.rs | ||
| text_util.rs | ||
| time_util.rs | ||
| ui.rs | ||