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}"
698
698
) ;
699
699
console . log ( "big buns - the proper rebase returned" ) ;
700
700
701
+ /**
702
+ * will need to apply, unless proven otherwise
703
+ */
704
+ markThatNeedsToApply ( ) ;
705
+
701
706
/**
702
707
* part 2 of "the different ways to launch git rebase"
703
708
*/
@@ -770,8 +775,11 @@ mv -f "${preparedRegularRebaseTodoFile}" "${pathToRegularRebaseTodoFile}"
770
775
} ) ;
771
776
console . log ( "" ) ;
772
777
773
- if ( rebaseChangedLocalHistory ) {
774
- markThatNeedsToApply ( ) ;
778
+ if ( ! rebaseChangedLocalHistory ) {
779
+ /**
780
+ * TODO `unmarkThatNeedsToApply` (NOT the same as `markThatApplied`!)
781
+ */
782
+ // unmarkThatNeedsToApply();
775
783
}
776
784
777
785
/**
You can’t perform that action at this time.
0 commit comments