-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
83 lines (64 loc) · 1.5 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
[color]
branch = auto
diff = auto
status = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
frag = magenta bold
meta = yellow bold
new = green bold
old = red bold
[color "status"]
added = green
changed = yellow
untracked = cyan
[commit]
gpgsign = true
[core]
pager = delta --side-by-side -w ${FZF_PREVIEW_COLUMNS:-$COLUMNS}
[diff]
colorMoved = default
[gpg]
program = gpg
[init]
defaultBranch = main
[interactive]
diffFilter = delta --color-only --features=interactive
[merge]
conflictstyle = diff3
tool = code
[mergetool "code"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
[pager]
# Print a diff without the pager: git --no-pager diff
diff = delta --side-by-side -w ${FZF_PREVIEW_COLUMNS:-$COLUMNS}
log = delta --side-by-side -w ${FZF_PREVIEW_COLUMNS:-$COLUMNS}
reflog = delta --side-by-side -w ${FZF_PREVIEW_COLUMNS:-$COLUMNS}
show = delta --side-by-side -w ${FZF_PREVIEW_COLUMNS:-$COLUMNS}
[pull]
rebase = false
[push]
default = current
[rebase]
autosquash = true
autostash = true
[user]
email = PSalant@gmail.com
name = Phil Salant
signingkey = 210DBF9BBAF6FC45
# Delta diff viewer config
[delta]
features = decorations line-numbers
[delta "decorations"]
file-decoration-style = magenta ul ol
file-style = magenta
hunk-header-style = omit
minus-style = syntax bold auto
plus-style = syntax bold auto
[delta "line-numbers"]
line-numbers = true
line-numbers-left-style = syntax
line-numbers-right-style = syntax