Skip to content

Commit 85ccd10

Browse files
committed
fix: lol why did i do that
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
1 parent bee9244 commit 85ccd10

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

git-stacked-rebase.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,11 @@ function areOptionsIncompetible(
6666
): boolean {
6767
if (options.viewTodoOnly) {
6868
if (options.apply) reasons.push("--apply cannot be used together with --view-todo");
69-
if (options.push) reasons.push("--apply cannot be used together with --push");
70-
if (options.forcePush) reasons.push("--apply cannot be used together with --push -f");
71-
if (options.branchSequencer) reasons.push("--apply cannot be used together with --branch-sequencer");
72-
if (options.branchSequencerExec) reasons.push("--apply cannot be used together with --branch-sequencer --exec");
69+
if (options.push) reasons.push("--push cannot be used together with --view-todo");
70+
if (options.forcePush) reasons.push("--push --force cannot be used together with --view-todo");
71+
if (options.branchSequencer) reasons.push("--branch-sequencer cannot be used together with --view-todo");
72+
if (options.branchSequencerExec)
73+
reasons.push("--branch-sequencer --exec cannot be used together with --view-todo");
7374
}
7475

7576
/**

0 commit comments

Comments
 (0)