summaryrefslogtreecommitdiffstats
path: root/pkg/gui/diffing.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-09-23 19:52:52 +1000
committerJesse Duffield <jessedduffield@gmail.com>2020-09-26 11:03:38 +1000
commitfe64f2f4c9d79df44f31b549352eefce2b2c5c8b (patch)
treecda31b10460fc99a8732d9050f9b061b2f91bd31 /pkg/gui/diffing.go
parent03ea4a884a74620a1a833f4829ae34f7989733fd (diff)
use --no-ext-diff flag for git diff
Diffstat (limited to 'pkg/gui/diffing.go')
-rw-r--r--pkg/gui/diffing.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/diffing.go b/pkg/gui/diffing.go
index ef7919273..a02c3d337 100644
--- a/pkg/gui/diffing.go
+++ b/pkg/gui/diffing.go
@@ -14,7 +14,7 @@ func (gui *Gui) exitDiffMode() error {
func (gui *Gui) renderDiff() error {
cmd := gui.OSCommand.ExecutableFromString(
- fmt.Sprintf("git diff --color %s", gui.diffStr()),
+ fmt.Sprintf("git diff --no-ext-diff --color %s", gui.diffStr()),
)
task := gui.createRunPtyTask(cmd)