sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Merge pull request #1975 from mark2185/fix-unmatching-remote-branch-name

Browse Source
This commit is contained in:
Jesse Duffield
2022-06-09 20:12:56 +10:00
committed by GitHub
parent 24e3afbb56 55a941d5dc
commit cdec70cc06
50 changed files with 112 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,7 +341,7 @@ func (self *BranchesController) fastForward(branch *models.Branch) error {
err := self.git.Sync.Pull(
git_commands.PullOptions{
RemoteName: branch.UpstreamRemote,
BranchName: branch.Name,
BranchName: branch.UpstreamBranch,
FastForwardOnly: true,
},
)