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

feature: allow merging tags into branches (#671)

Browse source 
Adds "Merge {tag} into {branch}" menu item to tag menu in histories.
The rest is handled by already existing merge code.
This commit is contained in:
Dmitrij D. Czarkoff 2024-11-10 04:51:15 +00:00 • committed by GitHub
parent b974436c8a
commit 4924e960bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Resources/Locales/ru_RU.axaml
View file

@ -637,6 +637,7 @@
<x:String x:Key="Text.TagCM.Copy" xml:space="preserve">Копировать имя метки</x:String>
<x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">Копировать сообщение с метки</x:String>
<x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Удалить ${0}$...</x:String>
<x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Слить ${0}$ в ${1}$...</x:String>
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">Выложить ${0}$...</x:String>
<x:String x:Key="Text.URL" xml:space="preserve">Сетевой адрес:</x:String>
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Обновление подмодулей</x:String>