Add worktree option to fast forwarding operation

This commit is contained in:
John Mutuma 2024-11-08 15:40:07 +00:00 committed by Jesse Duffield
parent e1c18226bf
commit 5240b2862f

View file

@ -101,7 +101,7 @@ func (self *SyncCommands) Pull(task gocui.Task, opts PullOptions) error {
WorktreePathIf(opts.WorktreePath != "", opts.WorktreePath).
ToArgv()
// setting GIT_SEQUENCE_EDITOR to ':' as a way of skipping it, in case the user
// setting GIT_SEQUENCE_EDITOR to ':' as a way of skipping if, in case the user
// has 'pull.rebase = interactive' configured.
return self.cmd.New(cmdArgs).AddEnvVars("GIT_SEQUENCE_EDITOR=:").PromptOnCredentialRequest(task).Run()
}