@@ -35,11 +35,12 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
3535			OpensMenu :   true ,
3636		},
3737		{
38- 			Key :         opts .GetKey (opts .Config .Universal .CreateRebaseOptionsMenu ),
39- 			Handler :     opts .Guards .NoPopupPanel (self .c .Helpers ().MergeAndRebase .CreateRebaseOptionsMenu ),
40- 			Description : self .c .Tr .ViewMergeRebaseOptions ,
41- 			Tooltip :     self .c .Tr .ViewMergeRebaseOptionsTooltip ,
42- 			OpensMenu :   true ,
38+ 			Key :               opts .GetKey (opts .Config .Universal .CreateRebaseOptionsMenu ),
39+ 			Handler :           opts .Guards .NoPopupPanel (self .c .Helpers ().MergeAndRebase .CreateRebaseOptionsMenu ),
40+ 			Description :       self .c .Tr .ViewMergeRebaseOptions ,
41+ 			Tooltip :           self .c .Tr .ViewMergeRebaseOptionsTooltip ,
42+ 			OpensMenu :         true ,
43+ 			GetDisabledReason : self .canShowRebaseOptions ,
4344		},
4445		{
4546			Key :         opts .GetKey (opts .Config .Universal .Refresh ),
@@ -191,3 +192,12 @@ func (self *GlobalController) escape() error {
191192func  (self  * GlobalController ) toggleWhitespace () error  {
192193	return  (& ToggleWhitespaceAction {c : self .c }).Call ()
193194}
195+ 
196+ func  (self  * GlobalController ) canShowRebaseOptions () * types.DisabledReason  {
197+ 	if  self .c .Model ().WorkingTreeStateAtLastCommitRefresh .None () {
198+ 		return  & types.DisabledReason {
199+ 			Text : self .c .Tr .NotMergingOrRebasing ,
200+ 		}
201+ 	}
202+ 	return  nil 
203+ }
0 commit comments