dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-28 23:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feature: support to enable --squash and --push option while finishing git-flow branches (#1290)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-05-09 10:47:36 +08:00
parent e8bf58f6c3
commit ebe0e61367
No known key found for this signature in database
6 changed files with 47 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Views/GitFlowFinish.axaml
View file

@ -19,7 +19,7 @@
Classes="bold"
Text="{DynamicResource Text.GitFlow.FinishHotfix}"
IsVisible="{Binding IsHotfix}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32" ColumnDefinitions="150,*">
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
@ -30,8 +30,19 @@
</StackPanel>
<CheckBox Grid.Row="1" Grid.Column="1"
Content="{DynamicResource Text.GitFlow.FinishWithSquash}"
IsChecked="{Binding Squash, Mode=TwoWay}"
ToolTip.Tip="--squash"/>
<CheckBox Grid.Row="2" Grid.Column="1"
Content="{DynamicResource Text.GitFlow.FinishWithPush}"
IsChecked="{Binding AutoPush, Mode=TwoWay}"
ToolTip.Tip="--push"/>
<CheckBox Grid.Row="3" Grid.Column="1"
Content="{DynamicResource Text.GitFlow.KeepBranchAfterFinish}"
IsChecked="{Binding KeepBranch, Mode=TwoWay}"/>
IsChecked="{Binding KeepBranch, Mode=TwoWay}"
ToolTip.Tip="-k"/>
</Grid>
</StackPanel>
</UserControl>