diff --git a/README.md b/README.md index 597efba8..fbd890e1 100644 --- a/README.md +++ b/README.md @@ -23,3 +23,4 @@ ## Thanks * [PUMA](https://gitee.com/whgfu) 配置默认User +* [Rwing](https://gitee.com/rwing) GitFlow: add an option to keep branch after finish diff --git a/src/Views/Popups/GitFlowFinish.xaml b/src/Views/Popups/GitFlowFinish.xaml index 46139990..9edd0b49 100644 --- a/src/Views/Popups/GitFlowFinish.xaml +++ b/src/Views/Popups/GitFlowFinish.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:controls="clr-namespace:SourceGit.Views.Controls" - mc:Ignorable="d" + mc:Ignorable="d" d:DesignWidth="800"> @@ -32,17 +32,10 @@ Grid.Row="0" Grid.Column="2" Margin="4,0,0,0" x:Name="txtName"/> - + Content="{StaticResource Text.GitFlow.KeepBranchAfterFinish}"/>