Skip to content

Commit b4509ef

Browse files
authored
Allow rebasing toogle menu position updated (#4189)
1 parent 6da1b44 commit b4509ef

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

app/src/lib/branch/BranchLanePopupMenu.svelte

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,8 @@
104104
branch.files?.length === 0 ||
105105
!branch.active}
106106
/>
107-
108-
<ContextMenuItem label="Allow rebasing" on:click={toggleAllowRebasing}>
109-
<Toggle
110-
small
111-
slot="control"
112-
bind:checked={allowRebasing}
113-
on:click={toggleAllowRebasing}
114-
help="Having this enabled permits commit amending and reordering after a branch has been pushed, which would subsequently require force pushing"
115-
/>
116-
</ContextMenuItem>
117107
</ContextMenuSection>
108+
118109
<ContextMenuSection>
119110
<ContextMenuItem
120111
label="Set remote branch name"
@@ -126,6 +117,19 @@
126117
}}
127118
/>
128119
</ContextMenuSection>
120+
121+
<ContextMenuSection>
122+
<ContextMenuItem label="Allow rebasing" on:click={toggleAllowRebasing}>
123+
<Toggle
124+
small
125+
slot="control"
126+
bind:checked={allowRebasing}
127+
on:click={toggleAllowRebasing}
128+
help="Having this enabled permits commit amending and reordering after a branch has been pushed, which would subsequently require force pushing"
129+
/>
130+
</ContextMenuItem>
131+
</ContextMenuSection>
132+
129133
<ContextMenuSection>
130134
<ContextMenuItem
131135
label="Create branch to the left"

0 commit comments

Comments
 (0)