diff --git a/cli/src/commands/branch/rename.rs b/cli/src/commands/branch/rename.rs index 0a8b5818525..f83edc86e4b 100644 --- a/cli/src/commands/branch/rename.rs +++ b/cli/src/commands/branch/rename.rs @@ -67,11 +67,11 @@ pub fn cmd_branch_rename( if has_tracked_remote_branches(view, old_branch) { writeln!( ui.warning_default(), - "Branch {old_branch} has tracking remote branches which were not renamed." + "Branch {old_branch} has tracked remote branches which were not renamed." )?; writeln!( ui.hint_default(), - "to rename the branch on the remote, you can `jj git push --branch {old_branch}` \ + "To rename the branch on the remote, you can `jj git push --branch {old_branch}` \ first (to delete it on the remote), and then `jj git push --branch {new_branch}`. \ `jj git push --all` would also be sufficient." )?; diff --git a/cli/tests/test_branch_command.rs b/cli/tests/test_branch_command.rs index 560f31c51c3..6f4dacd921f 100644 --- a/cli/tests/test_branch_command.rs +++ b/cli/tests/test_branch_command.rs @@ -354,8 +354,8 @@ fn test_branch_rename() { let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["branch", "rename", "bremote", "bremote2"]); insta::assert_snapshot!(stderr, @r###" - Warning: Branch bremote has tracking remote branches which were not renamed. - Hint: to rename the branch on the remote, you can `jj git push --branch bremote` first (to delete it on the remote), and then `jj git push --branch bremote2`. `jj git push --all` would also be sufficient. + Warning: Branch bremote has tracked remote branches which were not renamed. + Hint: To rename the branch on the remote, you can `jj git push --branch bremote` first (to delete it on the remote), and then `jj git push --branch bremote2`. `jj git push --all` would also be sufficient. "###); }