File tree Expand file tree Collapse file tree 4 files changed +0
-18
lines changed Expand file tree Collapse file tree 4 files changed +0
-18
lines changed Original file line number Diff line number Diff line change 143
143
<x : String x : Key =" Text.CommitCM.Reword" xml : space =" preserve" >Reword</x : String >
144
144
<x : String x : Key =" Text.CommitCM.SaveAsPatch" xml : space =" preserve" >Save as Patch...</x : String >
145
145
<x : String x : Key =" Text.CommitCM.Squash" xml : space =" preserve" >Squash into Parent</x : String >
146
- <x : String x : Key =" Text.CommitCM.SquashCommitsSinceThis" xml : space =" preserve" >Squash Children into ${0}$</x : String >
147
146
<x : String x : Key =" Text.CommitDetail.Changes" xml : space =" preserve" >CHANGES</x : String >
148
147
<x : String x : Key =" Text.CommitDetail.Changes.Count" xml : space =" preserve" >changed file(s)</x : String >
149
148
<x : String x : Key =" Text.CommitDetail.Changes.Search" xml : space =" preserve" >Search Changes...</x : String >
Original file line number Diff line number Diff line change 147
147
<x : String x : Key =" Text.CommitCM.Reword" xml : space =" preserve" >编辑提交信息</x : String >
148
148
<x : String x : Key =" Text.CommitCM.SaveAsPatch" xml : space =" preserve" >另存为补丁 ...</x : String >
149
149
<x : String x : Key =" Text.CommitCM.Squash" xml : space =" preserve" >合并此提交到上一个提交</x : String >
150
- <x : String x : Key =" Text.CommitCM.SquashCommitsSinceThis" xml : space =" preserve" >合并之后的提交到 ${0}$</x : String >
151
150
<x : String x : Key =" Text.CommitDetail.Changes" xml : space =" preserve" >变更对比</x : String >
152
151
<x : String x : Key =" Text.CommitDetail.Changes.Count" xml : space =" preserve" >个文件发生变更</x : String >
153
152
<x : String x : Key =" Text.CommitDetail.Changes.Search" xml : space =" preserve" >查找变更...</x : String >
Original file line number Diff line number Diff line change 147
147
<x : String x : Key =" Text.CommitCM.Reword" xml : space =" preserve" >編輯提交訊息</x : String >
148
148
<x : String x : Key =" Text.CommitCM.SaveAsPatch" xml : space =" preserve" >另存為修補檔 (patch)...</x : String >
149
149
<x : String x : Key =" Text.CommitCM.Squash" xml : space =" preserve" >合併此提交到上一個提交</x : String >
150
- <x : String x : Key =" Text.CommitCM.SquashCommitsSinceThis" xml : space =" preserve" >合併之後的提交至 ${0}$</x : String >
151
150
<x : String x : Key =" Text.CommitDetail.Changes" xml : space =" preserve" >變更對比</x : String >
152
151
<x : String x : Key =" Text.CommitDetail.Changes.Count" xml : space =" preserve" >個檔案已變更</x : String >
153
152
<x : String x : Key =" Text.CommitDetail.Changes.Search" xml : space =" preserve" >搜尋變更...</x : String >
Original file line number Diff line number Diff line change @@ -497,21 +497,6 @@ public ContextMenu CreateContextMenuForSelectedCommits(List<Models.Commit> selec
497
497
e . Handled = true ;
498
498
} ;
499
499
menu . Items . Add ( reset ) ;
500
-
501
- if ( commit . IsMerged )
502
- {
503
- var squash = new MenuItem ( ) ;
504
- squash . Header = App . Text ( "CommitCM.SquashCommitsSinceThis" , commit . SHA . Substring ( 0 , 10 ) ) ;
505
- squash . Icon = App . CreateMenuIcon ( "Icons.SquashIntoParent" ) ;
506
- squash . Click += ( _ , e ) =>
507
- {
508
- if ( _repo . CanCreatePopup ( ) )
509
- _repo . ShowPopup ( new Squash ( _repo , commit , commit . SHA ) ) ;
510
-
511
- e . Handled = true ;
512
- } ;
513
- menu . Items . Add ( squash ) ;
514
- }
515
500
}
516
501
else
517
502
{
You can’t perform that action at this time.
0 commit comments