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

use git branch when merging branches

Browse source
This commit is contained in:
Jesse Duffield 2018-08-07 14:10:15 +10:00
parent ab03902d08
commit e23ed80eaa
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gitcommands.go
View file

@ -205,7 +205,7 @@ func branchAlreadyStored(branchLine string, branches []Branch) bool {
// directory i.e. things we've fetched but haven't necessarily checked out. // directory i.e. things we've fetched but haven't necessarily checked out.
// Worth mentioning this has nothing to do with the 'git merge' operation // Worth mentioning this has nothing to do with the 'git merge' operation
func getAndMergeFetchedBranches(branches []Branch) []Branch { func getAndMergeFetchedBranches(branches []Branch) []Branch {
rawString, err := runDirectCommand(getHeadsCommand) rawString, err := runDirectCommand("git branch")
if err != nil { if err != nil {
return branches return branches
} }