-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
104 lines (99 loc) · 2.22 KB
/
Copy path.gitconfig
File metadata and controls
104 lines (99 loc) · 2.22 KB
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
[core]
excludesfile = ~/.gitignore
editor = nvim
pager = delta
[user]
name = Uģis Ornicāns
useConfigOnly = true
[commit]
verbose = true
[alias]
co = checkout
s = status -s -b
b = branch
f = fetch
c = commit
mt = mergetool
ps = push
pst = push --tags
pl = pull
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
sa = stash apply
sl = stash list --pretty=format:'%Cblue%h %Cred* %C(yellow)%s'
in = "!git remote update -p; git log ..@{u}"
out = log @{u}..
sh = describe --always
undo = checkout --
unstage = reset -q HEAD --
d = difftool
[push]
default = current
followTags = true
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[color]
branch = auto
diff = auto
interactive = auto
status = auto
[diff]
colorMoved = default
prompt = true
tool = nvimdiff2
[merge]
prompt = true
tool = nvim
keepBackup = false
[github]
user = decayofmind
[difftool]
prompt = false
[diff "sopsdiffer"]
textconv = sops -d
; [mergetool "diffview.nvim"]
; cmd = nvim \"+DiffviewOpen\"
[mergetool "nvim"]
cmd = nvim -f -c \"DiffviewOpen\"
# trustExitCode = true
prompt = false
; [mergetool "nvimdiff4"]
; cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
; [mergetool "nfugitive"]
; cmd = nvim -f -c "Gdiff" "$MERGED"
[mergetool "gitconflict"]
cmd = nvim \"$MERGED\"
trustExitCode = true
prompt = false
[diff]
tool = nvimdiff2
[difftool "nvimdiff2"]
cmd = nvim -d $LOCAL $REMOTE
[diff "plist"]
textconv = plutil -convert xml1 -o -
[init]
templateDir = /Users/roman.komkov/.git-template
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[interactive]
diffFilter = delta --color-only --features=interactive
[delta]
features = decorations
[delta "interactive"]
keep-plus-minus-markers = false
[delta "decorations"]
commit-decoration-style = blue ol
commit-style = raw
file-style = omit
hunk-header-decoration-style = blue box
hunk-header-file-style = red
hunk-header-line-number-style = "#067a00"
hunk-header-style = file line-number syntax
[include]
path = ~/.gitconfig.local
[diff "plist"]
textconv = plutil -convert xml1 -o -