-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
53 lines (47 loc) · 1.06 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
[user]
name = jsonMartin
email = jason.carter.martin@gmail.com
[alias]
print = !git cat-file -p
staged = !git diff --cached
[pager]
diff = delta
log = delta
reflog = delta
show = delta
[delta]
plus-style = "syntax #012800"
minus-style = "syntax #340001"
syntax-theme = Monokai Extended
navigate = true
side-by-side = true
[interactive]
diffFilter = delta --color-only
[color]
ui = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = 11
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
# 3 pane mergetool, with merged file in the center
# Define command which will be used when "nvim" is set as a merge tool
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
# set "nvim" as tool for merging
[merge]
tool = nvim
# automatically launch merge tool without displaying a prompt
[mergetool]
prompt = false
[push]
default = current
[credential]
helper = cache