diff --git a/git-stacked-rebase.ts b/git-stacked-rebase.ts index 51b3526f..f5599164 100755 --- a/git-stacked-rebase.ts +++ b/git-stacked-rebase.ts @@ -701,6 +701,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}" ); console.log("big buns - the proper rebase returned"); + /** + * will need to apply, unless proven otherwise + */ + markThatNeedsToApply(); + /** * part 2 of "the different ways to launch git rebase" */ @@ -775,8 +780,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}" }); console.log(""); - if (rebaseChangedLocalHistory) { - markThatNeedsToApply(); + if (!rebaseChangedLocalHistory) { + /** + * TODO `unmarkThatNeedsToApply` (NOT the same as `markThatApplied`!) + */ + // unmarkThatNeedsToApply(); } /**