diff --git a/git-branchless-lib/src/core/rewrite/plan.rs b/git-branchless-lib/src/core/rewrite/plan.rs index 922d2f0b2..18366d84b 100644 --- a/git-branchless-lib/src/core/rewrite/plan.rs +++ b/git-branchless-lib/src/core/rewrite/plan.rs @@ -544,7 +544,7 @@ impl BuildRebasePlanError { You are trying to rewrite {}, such as: {} It is generally not advised to rewrite public commits, because your collaborators will have difficulty merging your changes. -Retry with -f/--force to proceed anyways.", +Retry with -f/--force-rewrite to proceed anyways.", Pluralize { determiner: None, amount: public_commits_to_move.count()?, diff --git a/git-branchless/tests/command/test_move.rs b/git-branchless/tests/command/test_move.rs index 52acb859a..608f3aba7 100644 --- a/git-branchless/tests/command/test_move.rs +++ b/git-branchless/tests/command/test_move.rs @@ -4476,7 +4476,7 @@ fn test_move_public_commit() -> eyre::Result<()> { You are trying to rewrite 2 public commits, such as: 96d1c37 create test2.txt It is generally not advised to rewrite public commits, because your collaborators will have difficulty merging your changes. - Retry with -f/--force to proceed anyways. + Retry with -f/--force-rewrite to proceed anyways. "###); }