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

Revert "feat: support for push --force-if-includes"

Browse source 
This reverts commit e00f248cf7.
This commit is contained in:
Ryooooooga 2023-04-17 19:37:33 +09:00
parent 1efb565b22
commit 3546ab8f21
No known key found for this signature in database
GPG key ID: 07CF200DFCC20C25
3 changed files with 2 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/commands/git_commands/sync.go
View file

@ -29,11 +29,7 @@ func (self *SyncCommands) PushCmdObj(opts PushOpts) (oscommands.ICmdObj, error)
cmdStr := "git push"
if opts.Force {
if self.version.IsOlderThan(2, 30, 0) {
cmdStr += " --force-with-lease"
} else {
cmdStr += " --force-with-lease --force-if-includes"
}
cmdStr += " --force-with-lease"
}
if opts.SetUpstream {