go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-02 09:21:40 +02:00
Code Issues Releases Activity

show whitespace in diffs again

Browse Source
This commit is contained in:
Jesse Duffield 2018-07-28 16:52:20 +10:00
parent d6dbd46793
commit 2dfef09e55
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gitcommands.go
View File

@ -317,8 +317,8 @@ func sublimeOpenFile(filename string) (string, error) {
func getBranchDiff(branch string, baseBranch string) (string, error) { func getBranchDiff(branch string, baseBranch string) (string, error) {
return runCommand("git log -p -30 --color --no-merges " + branch) return runCommand("git log -p -30 --color --no-merges " + branch)
// return runCommand("git diff --color " + baseBranch + "..." + branch) // return runCommand("git diff --color " + baseBranch + "..." + branch)
} }
func verifyInGitRepo() { func verifyInGitRepo() {
@ -386,7 +386,7 @@ func getDiff(file GitFile) string {
if !file.Tracked && !file.HasStagedChanges { if !file.Tracked && !file.HasStagedChanges {
trackedArg = "--no-index /dev/null " trackedArg = "--no-index /dev/null "
} }
command := "git diff -b --color " + cachedArg + deletedArg + trackedArg + file.Name command := "git diff --color " + cachedArg + deletedArg + trackedArg + file.Name
// for now we assume an error means the file was deleted // for now we assume an error means the file was deleted
s, _ := runCommand(command) s, _ := runCommand(command)
return s return s