-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
84 lines (64 loc) · 1.68 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
84
# See https://jvns.ca/blog/2024/02/16/popular-git-config-options/ for
# descriptions of these options
# Allows storing large binary files more efficiently
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[user]
name = Caleb Burton
# Email will be overwritten depending on the directory
# email = [email protected]
# Ending the directory with / means include recursivly
[includeIf "gitdir:~/Code/GitHub/"]
path = ~/Code/GitHub/.gitconfig
[core]
excludesfile = ~/Code/GitHub/.gitignore
[includeIf "gitdir:~/Code/Aledade/"]
path = ~/Code/Aledade/.gitconfig
[core]
excludesfile = ~/Code/Aledade/.gitignore
# Sorts by most recent branches by default
[branch]
sort = -committerdate
[core]
editor = code --wait
[diff]
tool = default-difftool
algorithm = histogram
submodule = log
[difftool "default-difftool"]
cmd = code --wait --diff $LOCAL $REMOTE
[fetch]
fsckobjects = true
prune = true
[init]
defaultBranch = main
[log]
date = iso
[merge]
conflictstyle = zdiff3
[pull]
ff = only
# Avoid having to write `git push --set-upstream origin name`
# (only works as of git version 2.37.0)
[push]
default = simple
autoSetupRemote = true
followtags = true
[rebase]
autosquash = true
missingCommitsCheck = error
[receive]
fsckObjects = true
# "reuse recovered resolution": remember how you resolve merge conflicts during
# a rebase and automatically resolve conflicts when possible
[rerere]
enabled = true
[status]
submoduleSummary = true
[submodule]
recurse = true
[transfer]
fsckobjects = true