mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-28 15:26:25 +00:00
a1a980d395
`jj merge` just creates an empty change, which is practically the same as `jj new`. The main difference is that the former requires more than one argument and the latter requires at most one argument. It seems cleaner to generalize them and make them aliases. This patch starts doing that by making `jj new` accept more than one argument. Instead of having `jj merge` be exactly an alias for `jj new`, we may want to make it a thin wrapper that just checks that more than one argument was given. That would probably be less confusing to users who run `jj merge` without arguments to see what it does. We should probably make `jj checkout` also be an alias for `jj new`, but that will have to wait until we have removed support for open commits (since `jj checkout` still has logic for dealing with open commits). |
||
|---|---|---|
| .. | ||
| common | ||
| smoke_test.rs | ||
| test_alias.rs | ||
| test_branch_command.rs | ||
| test_checkout.rs | ||
| test_concurrent_operations.rs | ||
| test_describe_command.rs | ||
| test_diff_command.rs | ||
| test_edit_command.rs | ||
| test_git_clone.rs | ||
| test_git_colocated.rs | ||
| test_git_push.rs | ||
| test_git_remotes.rs | ||
| test_gitignores.rs | ||
| test_global_opts.rs | ||
| test_init_command.rs | ||
| test_log_command.rs | ||
| test_move_command.rs | ||
| test_new_command.rs | ||
| test_obslog_command.rs | ||
| test_operations.rs | ||
| test_print_command.rs | ||
| test_rebase_command.rs | ||
| test_restore_command.rs | ||
| test_sparse_command.rs | ||
| test_split_command.rs | ||
| test_squash_command.rs | ||
| test_touchup_command.rs | ||
| test_undo.rs | ||
| test_unsquash_command.rs | ||
| test_untrack_command.rs | ||
| test_workspaces.rs | ||