Repository navigation
Expand file tree
/
Copy pathdot_gitconfig
More file actions
64 lines (52 loc) · 1.5 KB
/
Copy pathdot_gitconfig
File metadata and controls
64 lines (52 loc) · 1.5 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
; Import user-specific settings (e.g. `user.name`, `user.email`)
[include]
path = ~/.my.gitconfig
; Import themes
[include]
path = ~/.config/delta/themes.gitconfig
; Import configs
[include]
path = ~/.config/delta/delta.gitconfig
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[pull]
ff = only
[init]
defaultBranch = main
[status]
; submoduleSummary = false
; Diff with Delta settings
[delta]
; Enable configs and themes from ~/.config/delta/
; gruvmax-fang
; features = unobtrusive-line-numbers decorations mellow-barbet
features = unobtrusive-line-numbers decorations
navigate = true # use n and N to move between diff sections
side-by-side = true # diff view
[core]
pager = delta
editor = nvim
[interactive]
diffFilter = delta --color-only
[merge]
conflictstyle = zdiff3 ; truncates same lines from both sides in the conflict
; conflictstyle = diff2
; conflictstyle = diff3
tool = nvimdiff
; Color lines that have just been moved differently (enabled with `diff.colorMoved`)
[color "diff"]
oldMoved = yellow bold
newMoved = cyan bold
[diff]
; ignoreSubmodules = all
algorithm = histogram
colorMoved = default
tool = nvimdiff
; tool = delta
; ; FIXME: delta not working for external diffs w/ lazygit (ctrl+t on files)
; [difftool "delta"]
; cmd = "delta $LOCAL $REMOTE"
; cmd = "delta --paging=never $LOCAL $REMOTE"