-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy path.gitconfig
69 lines (66 loc) · 1.29 KB
/
.gitconfig
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
65
66
67
68
69
[user]
name = Rogin Farrer
email = [email protected]
[color]
ui = true
status = always
[fetch]
prune = true
[core]
autocrlf = false
preloadindex = true
fscache = true
excludesfile = ~/.gitignore_global
editor = nvim
symlinks = true
pager = delta
[delta]
navigate = true # use n and N to move between diff sections
[log]
decorate = short
[pack]
useSparse = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[interactive]
diffFilter = delta --color-only
[init]
defaultBranch = main
[pull]
rebase = true
[help]
autoCorrect = prompt
[branch]
sort = -committerdate
[push]
autoSetupRemote = true
default = current
[merge]
conflictStyle = diff3
tool = gitconflict
[diff]
colorMoved = default
tool = gitconflict
keepBackup = false
[difftool "nvimdiff"]
cmd = nvim -d $LOCAL $REMOTE
[mergetool]
cmd = fugitive
keepBackup = false
trustExitCode = true
prompt = false
[mergetool "fugitive"]
cmd = nvim -f -c \"Gvdiffsplit\" \"$MERGED\"
[mergetool "diffview"]
cmd = nvim \"+DiffviewOpen\"
[mergetool "gitconflict"]
cmd = nvim \"$MERGED\"
[mergetool "diffconflicts"]
cmd = nvim -c DiffConflicts \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
[include]
path = ~/.gitconfig_local
[safe]
directory = *