diff --git a/cli/src/description_util.rs b/cli/src/description_util.rs index 394dbe617..4791bb95b 100644 --- a/cli/src/description_util.rs +++ b/cli/src/description_util.rs @@ -3,6 +3,7 @@ use std::io::Write as _; use bstr::ByteVec as _; use indexmap::IndexMap; +use indoc::indoc; use itertools::Itertools; use jj_lib::backend::CommitId; use jj_lib::commit::Commit; @@ -62,6 +63,10 @@ pub fn edit_multiple_descriptions( let mut commits_map = IndexMap::new(); let mut bulk_message = String::new(); + bulk_message.push_str(indoc! {r#" + JJ: Enter or edit commit descriptions after the `JJ: describe` lines. + + "#}); for (commit_id, temp_commit) in commits.iter() { let commit_hash = short_commit_hash(commit_id); bulk_message.push_str("JJ: describe "); diff --git a/cli/tests/test_describe_command.rs b/cli/tests/test_describe_command.rs index 5532669d1..a61fdf5d0 100644 --- a/cli/tests/test_describe_command.rs +++ b/cli/tests/test_describe_command.rs @@ -223,6 +223,8 @@ fn test_describe_multiple_commits() { "###); insta::assert_snapshot!( std::fs::read_to_string(test_env.env_root().join("editor0")).unwrap(), @r###" + JJ: Enter or edit commit descriptions after the `JJ: describe` lines. + JJ: describe 8d650510daad ------- JJ: describe 41659b846096 -------