-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
89 lines (68 loc) · 1.9 KB
/
.gitconfig
File metadata and controls
89 lines (68 loc) · 1.9 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
[core]
editor = nvim
precomposeunicode = false
quotepath = false
pager = delta
hookspath = ~/.config/git/hooks
[pager]
difftool = true
[commit]
verbose = true
[branch]
sort = -committerdate
[remote]
# “When you pull from one place (e.g. your upstream) and push to another
# place (e.g. your own publishing repository), you would want to set
# remote.pushDefault to specify the remote to push to for all branches […].”
# https://git-scm.com/docs/git-config#Documentation/git-config.txt-branchnamepushRemote
pushDefault = origin
[pull]
rebase = true
[push]
autoSetupRemote = true
[merge]
conflictstyle = zdiff3
tool = diffview
[mergetool]
prompt = false
keepBackup = false
[mergetool "diffview"]
# https://gist.github.com/Pagliacii/8fcb4dc64937305c19df9bb3137e4cad#using-diffviewnvim
# `-n` disables the swap file.
cmd = nvim -n -c "DiffviewOpen" "$MERGE"
[diff]
# This option handles moved code better.
# https://jvns.ca/blog/2024/02/16/popular-git-config-options/#diff-algorithm-histogram
algorithm = histogram
tool = difftastic
# https://git-scm.com/docs/git-difftool
[difftool]
prompt = false
# https://difftastic.wilfred.me.uk/git.html
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[init]
defaultBranch = main
[rebase]
autostash = true
autosquash = true
# https://git-scm.com/book/en/v2/Git-Tools-Rerere
[rerere]
enabled = true
# These includes don’t contain personal information.
[include]
path = ~/.config/git/aliases
path = ~/.config/git/tig
# These includes may contain personal information.
[include]
path = ~/.config/git/user
path = ~/.config/git/urls
[interactive]
diffFilter = delta --color-only
[delta]
features = side-by-side line-numbers decorations
whitespace-error-style = 22 reverse
[delta "decorations"]
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none