Merge branch 'mid-rebase'

germanapple · Aug 11, 2021 · e1b3eed · e1b3eed
2 parents 5e5a854 + a2af467
commit e1b3eed
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/node/lib/util/status_util.js b/node/lib/util/status_util.js
@@ -636,9 +636,10 @@ exports.checkReadiness = function (status) {
 
     if (null !== status.rebase) {
         return (`\
+You're in the middle of a regular (not git-meta) rebase.
 Before proceeding, you must complete the rebase in progress (by running
-'git meta rebase --continue') or abort it (by running
-'git meta rebase --abort').`);
+'git rebase --continue') or abort it (by running
+'git rebase --abort').`);
     }
     if (status.isConflicted()) {
         return (`\