-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
126 lines (97 loc) · 2.02 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
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
[apply]
whitespace = nowarn
[user]
user = arthurgehrke
email = [email protected]
name = Arthur Gehrke
[github]
user = arthurgehrke
[core]
editor = nvim
excludesfile = /Users/arthurgehrke/.gitignore
autocrlf = input
pager = nvimpager
; pager = diff-so-fancy | less --tabs=4 -RFX
[pager]
; difftool = true
branch = false
[pull]
rebase = true
[rebase]
updateRefs = true
[fetch]
prune = true
[rebase]
autoStash = true
autoSquash = true
[push]
default = current
autoSetupRemote = true
[branch]
autosetuprebase = always
[diff]
; tool = difftastic
; tool = nvimdiff
external = nvimdiff
; algorithm = patience
algorithm = histogram
; compactionHeuristic = true
; ignoreAllSpace = true
[difftool]
prompt = true
; [difftool "nvimdiff"]
; ; cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -c 'wincmd w' -c 'wincmd L'
; cmd = nvim -d $LOCAL $REMOTE -c 'wincmd w' -c 'wincmd L'
; trustExitCode = true
; [difftool "difftastic"]
; cmd = difft "$LOCAL" "$REMOTE"
[merge]
tool = nvimdiff
conflictStyle = zdiff3
prompt = false
ff = only
[mergetool]
keepBackup = false
prompt = false
trustExitCode = true
[mergetool "nvimdiff4"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c 'wincmd w' -c 'wincmd J'
keepBackup = false
trustExitCode = true
[push]
autoSetupRemote = true
[init]
defaultBranch = main
[url "[email protected]:"]
insteadOf = https://gitlab.com/
[url "[email protected]:doare/api-v2.git"]
insteadOf = https://gitlab.com/
[credential]
helper = osxkeychain
[color]
ui = true
; [color "branch"]
; current = yellow reverse
; local = yellow
; remote = green
; [color "diff"]
; meta = yellow bold
; frag = magenta bold # line info
; old = red # deletions
; new = green # additions
; [color "status"]
; added = yellow
; changed = green
; untracked = cyan
; [color "interactive"]
; prompt = 214
; header = 108
; help = 142
; error = 167
; [color "grep"]
; match = 142
; context = 246
; filename = 214
; function = 142
[npm]
prefix = ~/.npm-global