mathieu
/
config
1
1
Fork 0
Code Issues Pull Requests Releases Activity

[git]Add 2.9 feature to have nicer diff

This commit is contained in:
Mathieu Maret 2016-10-07 10:31:59 +02:00
parent fd13dea193
commit 11963d2af5
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitconfig
View File

@ -44,6 +44,7 @@
prompt = false prompt = false
[diff] [diff]
tool = meld tool = meld
compactionHeuristic = true
[mergetool "meld"] [mergetool "meld"]
path = /usr/bin/meld path = /usr/bin/meld
trustExitCode = false trustExitCode = false
@ -67,3 +68,9 @@
[rerere] [rerere]
enabled = true enabled = true
[pager]
log = /usr/share/git/diff-highlight/diff-highlight | less
show = /usr/share/git/diff-highlight/diff-highlight | less
diff = /usr/share/git/diff-highlight/diff-highlight | less
[interactive]
diffFilter = /usr/share/git/diff-highlight/diff-highlight