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

<fix>(*): 撤销了 commit ceff6ef102

Browse source
This commit is contained in:
ZCShou 2020-07-30 13:59:12 +08:00
parent a41c7a7b1c
commit 9ea9d18a4d
9 changed files with 25 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

16
SourceGit/UI/Pull.xaml
View file

@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="248" d:DesignWidth="500" Height="280" Width="500">
d:DesignHeight="248" d:DesignWidth="500" Height="248" Width="500">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="32"/>
@ -12,7 +12,6 @@
<RowDefinition Height="32"/>
<RowDefinition Height="32"/>
<RowDefinition Height="32"/>
<RowDefinition Height="32"/>
<RowDefinition Height="28"/>
<RowDefinition Height="28"/>
<RowDefinition Height="16"/>
@ -61,26 +60,19 @@
<Label x:Name="txtInto" VerticalAlignment="Center"/>
</StackPanel>
<Label Grid.Row="5" Grid.Column="0" HorizontalAlignment="Right" Content="Recurse Submodules :"/>
<StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal">
<RadioButton x:Name="RbtnRrsSubModYes" Content="Yes" GroupName="RecurseSubmodules"/>
<RadioButton x:Name="RbtnRrsSubModDemand" Content="On-Demand" Margin="8,0,0,0" GroupName="RecurseSubmodules" IsChecked="True"/>
<RadioButton x:Name="RbtnRrsSubModNo" Content="No" Margin="8,0,0,0" GroupName="RecurseSubmodules"/>
</StackPanel>
<CheckBox Grid.Row="6" Grid.Column="1"
<CheckBox Grid.Row="5" Grid.Column="1"
x:Name="chkRebase"
IsChecked="True"
VerticalAlignment="Center"
Content="Use rebase instead of merge"/>
<CheckBox Grid.Row="7" Grid.Column="1"
<CheckBox Grid.Row="6" Grid.Column="1"
x:Name="chkAutoStash"
IsChecked="True"
VerticalAlignment="Center"
Content="Stash &amp; reapply local changes"/>
<Grid Grid.Row="9" Grid.ColumnSpan="2">
<Grid Grid.Row="8" Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="80"/>