fix(plan): Display correct flag name about rewriting public commits (a…

…rxanas#515)
claytonrcarter · Aug 29, 2022 · 5bfe640 · 5bfe640
1 parent 7be9b87
commit 5bfe640
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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.
         "###);
     }