File tree 2 files changed +14
-9
lines changed
2 files changed +14
-9
lines changed Original file line number Diff line number Diff line change
1
+ [core]
2
+ pager = diff-so-fancy | less --tabs=4 -RFX
3
+
1
4
[mergetool "diffconflicts"]
2
5
cmd = diffconflicts nvim \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
3
6
trustExitCode = true
16
19
[pager]
17
20
dfi = false
18
21
dfp = false
22
+ diff = diff-so-fancy | less --tabs=4 -RFX
23
+ show = diff-so-fancy | less --tabs=4 -RFX
19
24
20
25
[diff "plist"]
21
26
textconv = plutil -convert xml1 -r -o -
24
29
textconv=pandoc --to=markdown
25
30
prompt = false
26
31
32
+ [interactive]
33
+ diffFilter = diff-so-fancy --patch
34
+
35
+ [diff-so-fancy]
36
+ markEmptyLines = true
37
+ changeHunkIndicators = true
38
+ stripLeadingSymbols = true
39
+ useUnicodeRuler = true
40
+ rulerWidth = 88
Original file line number Diff line number Diff line change 1
- [pager]
2
- # diff = diff-so-fancy | less --tabs=4 -RFX +'/^(Date|added|deleted|modified):' +1g
3
- diff = diff-so-fancy | less --tabs=4 -RFX
4
- show = diff-so-fancy | less --tabs=4 -RFX
5
- [core]
6
- pager = diff-so-fancy
7
- [interactive]
8
- # diffFilter = (echo && diff-so-fancy)
9
-
You can’t perform that action at this time.
0 commit comments