Better git diffs/merges, sort branches to show most recent active ones first
This commit is contained in:
parent
34b0719adb
commit
a2e3fe4f73
1 changed files with 5 additions and 0 deletions
|
@ -25,5 +25,10 @@
|
||||||
ui = true
|
ui = true
|
||||||
[diff]
|
[diff]
|
||||||
wsErrorHighlight = all
|
wsErrorHighlight = all
|
||||||
|
algorithm = histogram
|
||||||
[commit]
|
[commit]
|
||||||
verbose = true
|
verbose = true
|
||||||
|
[merge]
|
||||||
|
conflictstyle = diff3
|
||||||
|
[branch]
|
||||||
|
sort = -committerdate
|
||||||
|
|
Loading…
Reference in a new issue