From 718d2ad16c4b65727a1396054a1063bbd19ac61f Mon Sep 17 00:00:00 2001
From: Mutzi Muszkal <omuszkal@tenable.com>
Date: Fri, 10 Oct 2025 13:41:03 -0400
Subject: [PATCH] Add custom branch name option for push operations

---
 src/Resources/Locales/de_DE.axaml |  2 +
 src/Resources/Locales/en_US.axaml |  2 +
 src/Resources/Locales/es_ES.axaml |  2 +
 src/Resources/Locales/fr_FR.axaml |  2 +
 src/Resources/Locales/it_IT.axaml |  2 +
 src/Resources/Locales/ja_JP.axaml |  2 +
 src/Resources/Locales/pt_BR.axaml |  2 +
 src/Resources/Locales/ru_RU.axaml |  2 +
 src/Resources/Locales/ta_IN.axaml |  2 +
 src/Resources/Locales/uk_UA.axaml |  2 +
 src/Resources/Locales/zh_CN.axaml |  2 +
 src/Resources/Locales/zh_TW.axaml |  2 +
 src/ViewModels/Push.cs            | 75 ++++++++++++++++++++++++++++---
 src/Views/Push.axaml              | 69 ++++++++++++++++------------
 14 files changed, 134 insertions(+), 34 deletions(-)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index b6a302e26..7b11d6898 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -631,6 +631,8 @@
   <x:String x:Key="Text.Push.Revision.Title" xml:space="preserve">Revision zu Remote-Branch pushen</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Push</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Remote-Branch:</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch" xml:space="preserve">Benutzerdefinierten Branch-Namen verwenden</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch.Placeholder" xml:space="preserve">Benutzerdefinierten Branch-Namen eingeben...</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Remote-Branch verfolgen</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Alle Tags pushen</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Tag zum Remote pushen</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 7884a14d2..6334c6cde 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -631,6 +631,8 @@
   <x:String x:Key="Text.Push.Revision.Title" xml:space="preserve">Push Revision To Remote</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Push Changes To Remote</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Remote Branch:</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch" xml:space="preserve">Use custom branch name</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch.Placeholder" xml:space="preserve">Enter custom branch name...</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Set as tracking branch</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Push all tags</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Push Tag To Remote</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 30e793376..8ebb30f42 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -635,6 +635,8 @@
   <x:String x:Key="Text.Push.Revision.Title" xml:space="preserve">Push Revisión al Remoto</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Push Cambios al Remoto</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Rama Remota:</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch" xml:space="preserve">Usar nombre de rama personalizado</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch.Placeholder" xml:space="preserve">Ingrese nombre de rama personalizado...</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Establecer como rama de seguimiento</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Push todas las etiquetas</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Push Etiqueta al Remoto</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 32ae0e9f9..466d98d79 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -498,6 +498,8 @@
   <x:String x:Key="Text.Push.Remote" xml:space="preserve">Dépôt distant :</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Pousser les changements vers le dépôt distant</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Branche distante :</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch" xml:space="preserve">Utiliser un nom de branche personnalisé</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch.Placeholder" xml:space="preserve">Saisir un nom de branche personnalisé...</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Définir comme branche de suivi</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Pousser tous les tags</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Pousser les tags vers le dépôt distant</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 7d05b8c9f..1cf99769d 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -610,6 +610,8 @@
   <x:String x:Key="Text.Push.Revision.Title" xml:space="preserve">Invia Revisione Al Remoto</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Invia modifiche al remoto</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Branch Remoto:</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch" xml:space="preserve">Usa nome branch personalizzato</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch.Placeholder" xml:space="preserve">Inserisci nome branch personalizzato...</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Imposta come branch di tracciamento</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Invia tutti i tag</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Invia Tag al Remoto</x:String>
diff --git a/src/Resources/Locales/ja_JP.axaml b/src/Resources/Locales/ja_JP.axaml
index 4698a5508..5db951efb 100644
--- a/src/Resources/Locales/ja_JP.axaml
+++ b/src/Resources/Locales/ja_JP.axaml
@@ -497,6 +497,8 @@
   <x:String x:Key="Text.Push.Remote" xml:space="preserve">リモート:</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">変更をリモートにプッシュ</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">リモート ブランチ:</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch" xml:space="preserve">カスタムブランチ名を使用</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch.Placeholder" xml:space="preserve">カスタムブランチ名を入力...</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">追跡ブランチとして設定</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">すべてのタグをプッシュ</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">リモートにタグをプッシュ</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index bc1f92ebe..7ed9e69f7 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -457,6 +457,8 @@
   <x:String x:Key="Text.Push.Remote" xml:space="preserve">Remoto:</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Empurrar Alterações para o Remoto</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Branch Remoto:</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch" xml:space="preserve">Usar nome de branch personalizado</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch.Placeholder" xml:space="preserve">Digite o nome do branch personalizado...</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Definir como branch de rastreamento</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Empurrar todas as tags</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Empurrar Tag para o Remoto</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 776bb7816..82b8abf9b 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -635,6 +635,8 @@
   <x:String x:Key="Text.Push.Revision.Title" xml:space="preserve">Выложить ревизию на удалёную</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Выложить изменения на внешний репозиторий</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Ветка внешнего репозитория:</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch" xml:space="preserve">Использовать пользовательское имя ветки</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch.Placeholder" xml:space="preserve">Введите пользовательское имя ветки...</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Отслеживать ветку</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Выложить все метки</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Выложить метку на внешний репозиторий</x:String>
diff --git a/src/Resources/Locales/ta_IN.axaml b/src/Resources/Locales/ta_IN.axaml
index a29ccef34..e31c3919f 100644
--- a/src/Resources/Locales/ta_IN.axaml
+++ b/src/Resources/Locales/ta_IN.axaml
@@ -497,6 +497,8 @@
   <x:String x:Key="Text.Push.Remote" xml:space="preserve">தொலை:</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">மாற்றங்களை தொலைக்கு தள்ளு</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">தொலை கிளை:</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch" xml:space="preserve">தனிப்பயன் கிளைப் பெயரைப் பயன்படுத்து</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch.Placeholder" xml:space="preserve">தனிப்பயன் கிளைப் பெயரை உள்ளிடவும்...</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">கண்காணிப்பு கிளையாக அமை</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">அனைத்து குறிச்சொற்களையும் தள்ளு</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">தொலைக்கு குறிச்சொல்லை தள்ளு</x:String>
diff --git a/src/Resources/Locales/uk_UA.axaml b/src/Resources/Locales/uk_UA.axaml
index 82e2a0c6f..670884773 100644
--- a/src/Resources/Locales/uk_UA.axaml
+++ b/src/Resources/Locales/uk_UA.axaml
@@ -502,6 +502,8 @@
   <x:String x:Key="Text.Push.Remote" xml:space="preserve">Віддалене сховище:</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Надіслати зміни на віддалене сховище</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Віддалена гілка:</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch" xml:space="preserve">Використовувати користувацьку назву гілки</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch.Placeholder" xml:space="preserve">Введіть користувацьку назву гілки...</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Встановити як відстежувану гілку</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Надіслати всі теги</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Надіслати тег на віддалене сховище</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index cc3b04549..15a03ecc9 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -635,6 +635,8 @@
   <x:String x:Key="Text.Push.Revision.Title" xml:space="preserve">推送指定修订到远程仓库</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">推送到远程仓库</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">远程分支 ：</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch" xml:space="preserve">使用自定义分支名称</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch.Placeholder" xml:space="preserve">输入自定义分支名称...</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">跟踪远程分支</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">同时推送标签</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">推送标签到远程仓库</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 14c7509cd..aa408a715 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -635,6 +635,8 @@
   <x:String x:Key="Text.Push.Revision.Title" xml:space="preserve">推送修訂到遠端存放庫</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">推送到遠端存放庫</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">遠端分支:</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch" xml:space="preserve">使用自訂分支名稱</x:String>
+  <x:String x:Key="Text.Push.To.CustomBranch.Placeholder" xml:space="preserve">輸入自訂分支名稱...</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">追蹤遠端分支</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">同時推送標籤</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">推送標籤到遠端存放庫</x:String>
diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs
index 6b6857163..9834d65dc 100644
--- a/src/ViewModels/Push.cs
+++ b/src/ViewModels/Push.cs
@@ -57,7 +57,66 @@ public Models.Branch SelectedRemoteBranch
             set
             {
                 if (SetProperty(ref _selectedRemoteBranch, value, true))
+                {
+                    if (value != null)
+                    {
+                        CustomRemoteBranchName = value.Name;
+                    }
+
                     IsSetTrackOptionVisible = value != null && _selectedLocalBranch.Upstream != value.FullName;
+                }
+            }
+        }
+
+        [Required(ErrorMessage = "Remote branch name is required!!!")]
+        public string CustomRemoteBranchName
+        {
+            get => _customRemoteBranchName;
+            set
+            {
+                if (SetProperty(ref _customRemoteBranchName, value, true))
+                {
+                    if (UseCustomBranchName)
+                    {
+                        var expectedUpstream = $"refs/remotes/{_selectedRemote.Name}/{value}";
+                        IsSetTrackOptionVisible = !string.IsNullOrEmpty(value) &&
+                                                  _selectedLocalBranch.Upstream != expectedUpstream;
+                    }
+                }
+            }
+        }
+
+        public bool UseCustomBranchName
+        {
+            get => _useCustomBranchName;
+            set
+            {
+                if (SetProperty(ref _useCustomBranchName, value))
+                {
+                    if (value)
+                    {
+                        // When switching to custom mode, pre-fill with the selected branch name if available
+                        if (_selectedRemoteBranch != null && string.IsNullOrEmpty(_customRemoteBranchName))
+                            _customRemoteBranchName = _selectedRemoteBranch.Name;
+
+                        // Update tracking visibility for custom branch
+                        if (_selectedLocalBranch != null && _selectedRemote != null && !string.IsNullOrEmpty(_customRemoteBranchName))
+                        {
+                            var expectedUpstream = $"refs/remotes/{_selectedRemote.Name}/{_customRemoteBranchName}";
+                            IsSetTrackOptionVisible = _selectedLocalBranch.Upstream != expectedUpstream;
+                        }
+                    }
+                    else
+                    {
+                        // When switching back to dropdown, update tracking visibility based on selected branch
+                        if (_selectedRemoteBranch != null)
+                        {
+                            IsSetTrackOptionVisible =
+                                _selectedRemoteBranch != null &&
+                                _selectedLocalBranch.Upstream != _selectedRemoteBranch.FullName;
+                        }
+                    }
+                }
             }
         }
 
@@ -155,6 +214,9 @@ public Push(Repository repo, Models.Branch localBranch)
 
         public override bool CanStartDirectly()
         {
+            if (UseCustomBranchName)
+                return !string.IsNullOrEmpty(_customRemoteBranchName);
+
             return !string.IsNullOrEmpty(_selectedRemoteBranch?.Head);
         }
 
@@ -162,7 +224,10 @@ public override async Task<bool> Sure()
         {
             using var lockWatcher = _repo.LockWatcher();
 
-            var remoteBranchName = _selectedRemoteBranch.Name;
+            var remoteBranchName =
+                UseCustomBranchName ?
+                    _customRemoteBranchName :
+                    _selectedRemoteBranch.Name;
             ProgressDescription = $"Push {_selectedLocalBranch.Name} -> {_selectedRemote.Name}/{remoteBranchName} ...";
 
             var log = _repo.CreateLog("Push");
@@ -218,11 +283,7 @@ private void AutoSelectBranchByRemote()
             }
 
             // Add a fake new branch.
-            var fake = new Models.Branch()
-            {
-                Name = _selectedLocalBranch.Name,
-                Remote = _selectedRemote.Name,
-            };
+            var fake = new Models.Branch { Name = _selectedLocalBranch.Name, Remote = _selectedRemote.Name };
             branches.Add(fake);
             RemoteBranches = branches;
             SelectedRemoteBranch = fake;
@@ -233,6 +294,8 @@ private void AutoSelectBranchByRemote()
         private Models.Remote _selectedRemote = null;
         private List<Models.Branch> _remoteBranches = [];
         private Models.Branch _selectedRemoteBranch = null;
+        private string _customRemoteBranchName = string.Empty;
+        private bool _useCustomBranchName = false;
         private bool _isSetTrackOptionVisible = false;
     }
 }
diff --git a/src/Views/Push.axaml b/src/Views/Push.axaml
index ae015c888..9eeb73ea9 100644
--- a/src/Views/Push.axaml
+++ b/src/Views/Push.axaml
@@ -12,7 +12,7 @@
                Classes="bold"
                Text="{DynamicResource Text.Push.Title}"/>
 
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,Auto,32,32" ColumnDefinitions="130,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32,Auto,Auto,32,32" ColumnDefinitions="130,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -58,51 +58,64 @@
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Push.To}"/>
-      <ComboBox Grid.Row="2" Grid.Column="1"
-                x:Name="RemoteBranchesComboBox"
-                Height="28" Padding="8,0"
-                VerticalAlignment="Center" HorizontalAlignment="Stretch"
-                ItemsSource="{Binding RemoteBranches}"
-                IsTextSearchEnabled="True"
-                SelectedItem="{Binding SelectedRemoteBranch, Mode=TwoWay}">
-        <ComboBox.ItemTemplate>
-          <DataTemplate x:DataType="{x:Type m:Branch}">
-            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
-              <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/>
-              <Border Height="14"
-                      CornerRadius="7"
-                      Margin="4,0,0,0" Padding="6,0"
-                      VerticalAlignment="Center"
-                      Background="Green"
-                      IsVisible="{Binding Head, Converter={x:Static StringConverters.IsNullOrEmpty}}">
-                <TextBlock Text="{DynamicResource Text.Push.New}" FontSize="9" FontFamily="{DynamicResource Fonts.Monospace}" Foreground="White" VerticalAlignment="Center"/>
-              </Border>
-            </StackPanel>
-          </DataTemplate>
-        </ComboBox.ItemTemplate>
-      </ComboBox>
+      <Grid Grid.Row="2" Grid.Column="1">
+        <ComboBox x:Name="RemoteBranchesComboBox"
+                  Height="28" Padding="8,0"
+                  VerticalAlignment="Center" HorizontalAlignment="Stretch"
+                  ItemsSource="{Binding RemoteBranches}"
+                  IsTextSearchEnabled="True"
+                  SelectedItem="{Binding SelectedRemoteBranch, Mode=TwoWay}"
+                  IsVisible="{Binding !UseCustomBranchName}">
+          <ComboBox.ItemTemplate>
+            <DataTemplate x:DataType="{x:Type m:Branch}">
+              <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
+                <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
+                <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/>
+                <Border Height="14"
+                        CornerRadius="7"
+                        Margin="4,0,0,0" Padding="6,0"
+                        VerticalAlignment="Center"
+                        Background="Green"
+                        IsVisible="{Binding Head, Converter={x:Static StringConverters.IsNullOrEmpty}}">
+                  <TextBlock Text="{DynamicResource Text.Push.New}" FontSize="9" FontFamily="{DynamicResource Fonts.Monospace}" Foreground="White" VerticalAlignment="Center"/>
+                </Border>
+              </StackPanel>
+            </DataTemplate>
+          </ComboBox.ItemTemplate>
+        </ComboBox>
+
+        <TextBox Height="28" Padding="8,0"
+                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
+                 Text="{Binding CustomRemoteBranchName, Mode=TwoWay}"
+                 Watermark="{DynamicResource Text.Push.To.CustomBranch.Placeholder}"
+                 IsVisible="{Binding UseCustomBranchName}"/>
+      </Grid>
 
       <CheckBox Grid.Row="3" Grid.Column="1"
+                Height="32"
+                Content="{DynamicResource Text.Push.To.CustomBranch}"
+                IsChecked="{Binding UseCustomBranchName, Mode=TwoWay}"/>
+
+      <CheckBox Grid.Row="4" Grid.Column="1"
                 Height="32"
                 Content="{DynamicResource Text.Push.Tracking}"
                 IsChecked="{Binding Tracking, Mode=TwoWay}"
                 IsVisible="{Binding IsSetTrackOptionVisible}"
                 ToolTip.Tip="-u"/>
 
-      <CheckBox Grid.Row="4" Grid.Column="1"
+      <CheckBox Grid.Row="5" Grid.Column="1"
                 Height="32"
                 Content="{DynamicResource Text.Push.CheckSubmodules}"
                 IsChecked="{Binding CheckSubmodules, Mode=TwoWay}"
                 IsVisible="{Binding IsCheckSubmodulesVisible}"
                 ToolTip.Tip="--recurse-submodules=check"/>
 
-      <CheckBox Grid.Row="5" Grid.Column="1"
+      <CheckBox Grid.Row="6" Grid.Column="1"
                 Content="{DynamicResource Text.Push.WithAllTags}"
                 IsChecked="{Binding PushAllTags, Mode=TwoWay}"
                 ToolTip.Tip="--tags"/>
 
-      <CheckBox Grid.Row="6" Grid.Column="1"
+      <CheckBox Grid.Row="7" Grid.Column="1"
                 Content="{DynamicResource Text.Push.Force}"
                 IsChecked="{Binding ForcePush, Mode=TwoWay}"
                 ToolTip.Tip="--force-with-lease"/>