| ... | ... | @@ -2601,37 +2601,35 @@ export function GeneralSettingsPanel() { |
| 2601 | 2601 | } |
| 2602 | 2602 | /> |
| 2603 | 2603 | |
| 2604 | | {settings.defaultThreadEnvMode === "worktree" ? ( |
| 2605 | | <SettingsRow |
| 2606 | | serverScoped |
| 2607 | | className="bg-muted/20 sm:pl-9" |
| 2608 | | title={searchableSetting("start-from-origin").title} |
| 2609 | | description="Creates the worktree from the latest matching branch on origin instead of your local branch." |
| 2610 | | resetAction={ |
| 2611 | | settings.newWorktreesStartFromOrigin !== |
| 2612 | | DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin ? ( |
| 2613 | | <SettingResetButton |
| 2614 | | label="new worktrees start from origin" |
| 2615 | | onClick={() => |
| 2616 | | updateSettings({ |
| 2617 | | newWorktreesStartFromOrigin: |
| 2618 | | DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin, |
| 2619 | | }) |
| 2620 | | } |
| 2621 | | /> |
| 2622 | | ) : null |
| 2623 | | } |
| 2624 | | control={ |
| 2625 | | <Switch |
| 2626 | | checked={settings.newWorktreesStartFromOrigin} |
| 2627 | | onCheckedChange={(checked) => |
| 2628 | | updateSettings({ newWorktreesStartFromOrigin: Boolean(checked) }) |
| 2604 | <SettingsRow |
| 2605 | serverScoped |
| 2606 | className="bg-muted/20 sm:pl-9" |
| 2607 | title={searchableSetting("start-from-origin").title} |
| 2608 | description="Creates the worktree from the latest matching branch on origin instead of your local branch." |
| 2609 | resetAction={ |
| 2610 | settings.newWorktreesStartFromOrigin !== |
| 2611 | DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin ? ( |
| 2612 | <SettingResetButton |
| 2613 | label="new worktrees start from origin" |
| 2614 | onClick={() => |
| 2615 | updateSettings({ |
| 2616 | newWorktreesStartFromOrigin: |
| 2617 | DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin, |
| 2618 | }) |
| 2629 | 2619 | } |
| 2630 | | aria-label="Start new worktrees from origin by default" |
| 2631 | 2620 | /> |
| 2632 | | } |
| 2633 | | /> |
| 2634 | | ) : null} |
| 2621 | ) : null |
| 2622 | } |
| 2623 | control={ |
| 2624 | <Switch |
| 2625 | checked={settings.newWorktreesStartFromOrigin} |
| 2626 | onCheckedChange={(checked) => |
| 2627 | updateSettings({ newWorktreesStartFromOrigin: Boolean(checked) }) |
| 2628 | } |
| 2629 | aria-label="Start new worktrees from origin by default" |
| 2630 | /> |
| 2631 | } |
| 2632 | /> |
| 2635 | 2633 | <SettingsRow |
| 2636 | 2634 | serverScoped |
| 2637 | 2635 | {...searchableSetting("add-project-starts-in")} |