mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 04:45:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix resetting or rebasing a branch to its upstream when the upstream branch name is different

Browse source
This commit is contained in:
Stefan Haller 2025-01-04 15:18:22 +01:00
parent 33e81f717d
commit 009062534e
3 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/gui/controllers/branches_controller.go
View file

@ -294,7 +294,7 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc
}
upstream := lo.Ternary(selectedBranch.RemoteBranchStoredLocally(),
fmt.Sprintf("%s/%s", selectedBranch.UpstreamRemote, selectedBranch.Name),
selectedBranch.ShortUpstreamRefName(),
self.c.Tr.UpstreamGenericName)
upstreamResetOptions := utils.ResolvePlaceholderString(
self.c.Tr.ViewUpstreamResetOptions,