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 @@ -698,6 +698,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}"
698698 ) ;
699699 console . log ( "big buns - the proper rebase returned" ) ;
700700
701+ /**
702+ * will need to apply, unless proven otherwise
703+ */
704+ markThatNeedsToApply ( ) ;
705+
701706 /**
702707 * part 2 of "the different ways to launch git rebase"
703708 */
@@ -770,8 +775,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}"
770775 } ) ;
771776 console . log ( "" ) ;
772777
773- if ( rebaseChangedLocalHistory ) {
774- markThatNeedsToApply ( ) ;
778+ if ( ! rebaseChangedLocalHistory ) {
779+ /**
780+ * TODO `unmarkThatNeedsToApply` (NOT the same as `markThatApplied`!)
781+ */
782+ // unmarkThatNeedsToApply();
775783 }
776784
777785 /**
You can’t perform that action at this time.
0 commit comments