We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 98c5697 commit 496308eCopy full SHA for 496308e
pkg/commands/git_commands/diff.go
@@ -17,11 +17,15 @@ func NewDiffCommands(gitCommon *GitCommon) *DiffCommands {
17
}
18
19
func (self *DiffCommands) DiffCmdObj(diffArgs []string) oscommands.ICmdObj {
20
+ extDiffCmd := self.UserConfig.Git.Paging.ExternalDiffCommand
21
+ useExtDiff := extDiffCmd != ""
22
+
23
return self.cmd.New(
24
NewGitCmd("diff").
25
Config("diff.noprefix=false").
26
+ ConfigIf(useExtDiff, "diff.external="+extDiffCmd).
27
+ ArgIfElse(useExtDiff, "--ext-diff", "--no-ext-diff").
28
Arg("--submodule").
- Arg("--no-ext-diff").
29
Arg(fmt.Sprintf("--color=%s", self.UserConfig.Git.Paging.ColorArg)).
30
Arg(diffArgs...).
31
Dir(self.repoPaths.worktreePath).
0 commit comments