-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
72 lines (72 loc) · 1.45 KB
/
Copy path.gitconfig
File metadata and controls
72 lines (72 loc) · 1.45 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
[init]
defaultBranch = main
[fetch]
prune = true
[pull]
rebase = true
[rebase]
autoStash = true
[commit]
verbose = true
[push]
autoSetupRemote = true
[column]
ui = auto
[core]
pager = delta
[alias]
co = checkout
st = status
di = diff
dt = difftool -y
dc = diff --cached
ci = commit
cm = commit -m
br = branch
sm = submodule
[help]
autocorrect = 20
[interactive]
diffFilter = delta --color-only
[color]
ui = auto
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[delta]
navigate = true
light = false
features = line-numbers decorations
whitespace-error-style = 22 reverse
relative-paths = true
hyperlinks = true
syntax-theme = Nord
[merge]
conflictstyle = zdiff3
tool = Kaleidoscope
[diff]
colorMoved = default
algorithm = histogram
tool = Kaleidoscope
[rerere]
enabled = true
[branch]
sort = -committerdate
[tag]
sort = -version:refname
[log]
date = iso
[difftool]
prompt = false
trustExitCode = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[ghq]
root = ~/projects/