From 43f0cf42e6cfdf19a4bbcb64f218c672cbdee548 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 10 Jun 2018 11:36:27 +1000
Subject: [PATCH] use log instead of diff for now

---
 gitcommands.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gitcommands.go b/gitcommands.go
index 091a638f8..7d2651eea 100644
--- a/gitcommands.go
+++ b/gitcommands.go
@@ -267,7 +267,9 @@ func sublimeOpenFile(filename string) (string, error) {
 }
 
 func getBranchDiff(branch string, baseBranch string) (string, error) {
-  return runCommand("git diff --color " + baseBranch + "..." + branch)
+
+  return runCommand("git log -p -30 --color --no-merges " + branch)
+  // return runCommand("git diff --color " + baseBranch + "..." + branch)
 }
 
 func verifyInGitRepo() {