From a02d3a0c4ee6d5bb8e3365cb7bf7934f9b3a9a77 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 6 Aug 2018 21:13:52 +1000 Subject: show graph when selecting branch in branch panel --- gitcommands.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gitcommands.go') diff --git a/gitcommands.go b/gitcommands.go index 27e4e8369..d4433b1c3 100644 --- a/gitcommands.go +++ b/gitcommands.go @@ -327,10 +327,15 @@ func sublimeOpenFile(filename string) (string, error) { return runCommand("subl " + filename) } -func getBranchDiff(branch string, baseBranch string) (string, error) { +func getBranchGraph(branch string, baseBranch string) (string, error) { - return runCommand("git log -p -30 --color --no-merges " + branch) - // return runCommand("git diff --color " + baseBranch + "..." + branch) + return runCommand("git log --graph --color --abbrev-commit --decorate --date=relative --pretty=medium " + branch) + + // return runCommand("git log --color --graph --oneline " + branch) + + // Leaving this guy commented out in case there's backlash from the design + // change and I want to make this configurable + // return runCommand("git log -p -30 --color --no-merges " + branch) } func verifyInGitRepo() { -- cgit v1.2.3