-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
62 lines (60 loc) · 1.3 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
[include]
path = ~/delta.gitconfig
[user]
name = mainframev
email = [email protected]
color = auto
[push]
default = current
[core]
editor = nvim
sparseCheckout = true
pager = delta --dark --diff-so-fancy
multiPackIndex = true
[rebase]
autosquash = true
[interactive]
diffFilter = delta --color-only
[github]
user = mainframev
protocol = https
[delta]
features = mellow-barbet
navigate = true
[difftool]
prompt = false
[difftool "nvimdiff"]
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
[difftool "kitty"]
cmd = kitty +kitten diff \"$LOCAL\" \"$REMOTE\"
[difftool "kitty.gui"]
cmd = kitty kitty +kitten diff \"$LOCAL\" \"$REMOTE\"
[difftool "nvim"]
cmd = nvim -d \"$LOCAL\" \"$REMOTE\"
[alias]
d = diff
ds = diff --staged
di = diff
dc = diff --cached
df = diff
fixup = commit --fixup
info = !git diff && git remote -v && git status
jump = "!$(brew --prefix git)/share/git-core/contrib/git-jump/git-jump"
[merge]
tool = nvimdiff
conflictstyle = zdiff3
[mergetool "nvimdiff"]
keepBackup = false
cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
trustExitCode = true
[color]
branch = auto
diff = auto
status = auto
interactive = true
ui = true
pager = true
[includeIf "gitdir:~/work/"]
path = ~/.gitconfig-work
[includeIf "gitdir:~/repos/"]
path = ~/.gitconfig-work