File tree Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -701,6 +701,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}"
701701 ) ;
702702 console . log ( "big buns - the proper rebase returned" ) ;
703703
704+ /**
705+ * will need to apply, unless proven otherwise
706+ */
707+ markThatNeedsToApply ( ) ;
708+
704709 /**
705710 * part 2 of "the different ways to launch git rebase"
706711 */
@@ -775,8 +780,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}"
775780 } ) ;
776781 console . log ( "" ) ;
777782
778- if ( rebaseChangedLocalHistory ) {
779- markThatNeedsToApply ( ) ;
783+ if ( ! rebaseChangedLocalHistory ) {
784+ /**
785+ * TODO `unmarkThatNeedsToApply` (NOT the same as `markThatApplied`!)
786+ */
787+ // unmarkThatNeedsToApply();
780788 }
781789
782790 /**
You can’t perform that action at this time.
0 commit comments